Change log handler to include file and line

Log handlers were previously required to acquire the file name and line
number from the file member in the parser. Providing both to the handler
is more intuitive. When multiple buffers become supported in a future
release it will also be more straightforward to the developer that the
file name is only correct while the log handler is executing.

Author: k0ekk0ek

include/zone.h

@@ -342,10 +342,14 @@ struct zone_parser;
  * By default messages are printed to stdout (info) and stderr (warnings,
  * errors). A custom log handler (callback) may be provided for better
  * integration of reporting.
+ *
+ * @note file maybe NULL if initial file does not exist.
  */
 typedef void(*zone_log_t)(
   zone_parser_t *,
   uint32_t, // priority
+  const char *, // file
+  size_t, // line
   const char *, // message
   void *); // user data
 

src/zone.c

@@ -483,10 +483,12 @@ int32_t zone_parse_string(
   return code;
 }
 
-zone_nonnull((1,3))
+zone_nonnull((1,5))
 static void print_message(
   zone_parser_t *parser,
   uint32_t priority,
+  const char *file,
+  size_t line,
   const char *message,
   void *user_data)
 {
@@ -495,8 +497,8 @@ static void print_message(
   assert(parser->file);
   FILE *output = priority == ZONE_INFO ? stdout : stderr;
 
-  if (parser->file->name)
-    fprintf(output, "%s:%zu: %s\n", parser->file->name, parser->file->line, message);
+  if (file)
+    fprintf(output, "%s:%zu: %s\n", file, line, message);
   else
     fprintf(output, "%s\n", message);
 }
@@ -526,8 +528,10 @@ void zone_vlog(
     memcpy(message+(sizeof(message) - 4), "...", 3);
   if (parser->options.log.callback)
     callback = parser->options.log.callback;
-
-  callback(parser, priority, message, parser->user_data);
+  assert(parser->file);
+  const char *file = parser->file->name;
+  const size_t line = parser->file->line;
+  callback(parser, priority, file, line, message, parser->user_data);
 }
 
 void zone_log(

tests/include.c

@@ -245,6 +245,7 @@ void include_from_string(void **state)
 
 typedef struct no_file_test no_file_test_t;
 struct no_file_test {
+  bool have_file;
   size_t accept_count, log_count;
 };
 
@@ -273,14 +274,18 @@ static int32_t no_such_file_accept(
 static void no_such_file_log(
   zone_parser_t *parser,
   uint32_t priority,
+  const char *file,
+  size_t line,
   const char *message,
   void *user_data)
 {
   (void)parser;
   (void)priority;
+  (void)line;
   if (!strstr(message, "no such file"))
     return;
   no_file_test_t *test = (no_file_test_t*)user_data;
+  test->have_file = file != NULL;
   test->log_count++;
 }
 
@@ -313,6 +318,7 @@ void the_file_that_wasnt(void **state)
   code = zone_parse(&parser, &options, &buffers, non_file, &test);
   free(non_file);
   assert_int_equal(code, ZONE_NOT_A_FILE);
+  assert_false(test.have_file);
   assert_true(test.log_count == 1);
   assert_true(test.accept_count == 0);
 }
@@ -351,6 +357,7 @@ void the_include_that_wasnt(void **state)
   free(include);
   free(non_include);
   assert_int_equal(code, ZONE_NOT_A_FILE);
+  assert_true(test.have_file);
   assert_true(test.log_count == 1);
   assert_true(test.accept_count == 0);
 }
@@ -379,11 +386,15 @@ static int32_t in_too_deep_accept(
 static void in_too_deep_log(
   zone_parser_t *parser,
   uint32_t priority,
+  const char *file,
+  size_t line,
   const char *message,
   void *user_data)
 {
   (void)parser;
   (void)priority;
+  (void)file;
+  (void)line;
 
   if (strstr(message, "nested too deeply"))
     *(size_t *)user_data |= 1u << 7;