Add specific log functions

Author: k0ekk0ek

include/zone.h

@@ -284,27 +284,6 @@ typedef void(*zone_log_t)(
   const char *, // message
   void *); // user data
 
-/**
- * @brief Write error message to active log handler.
- *
- * The zone parser operates on a per-record base and therefore cannot detect
- * errors that span records. e.g. SOA records being specified more than once.
- * The user may print a message using the active log handler, keeping the
- * error message format consistent.
- *
- * @param[in]  parser    Zone parser
- * @param[in]  category  Log category
- * @param[in]  format    Format string compatible with printf
- * @param[in]  ...       Variadic arguments corresponding to #format
- */
-ZONE_EXPORT void zone_log(
-  zone_parser_t *parser,
-  uint32_t category,
-  const char *format,
-  ...)
-zone_nonnull((1,3))
-zone_format_printf(3,4);
-
 typedef struct zone_name zone_name_t;
 struct zone_name {
   uint8_t length;
@@ -440,6 +419,82 @@ zone_parse_string(
   void *user_data)
 zone_nonnull((1,2,3,4));
 
+/**
+ * @brief Write error message to active log handler.
+ *
+ * The zone parser operates on a per-record base and therefore cannot detect
+ * errors that span records. e.g. SOA records being specified more than once.
+ * The user may print a message using the active log handler, keeping the
+ * error message format consistent.
+ *
+ * @param[in]  parser    Zone parser
+ * @param[in]  category  Log category
+ * @param[in]  format    Format string compatible with printf
+ * @param[in]  ...       Variadic arguments corresponding to #format
+ */
+ZONE_EXPORT void zone_log(
+  zone_parser_t *parser,
+  uint32_t category,
+  const char *format,
+  ...)
+zone_nonnull((1,3))
+zone_format_printf(3,4);
+
+/**
+ * @brief Write error message to active log handler.
+ *
+ * @param[in]  parser     Zone parser
+ * @param[in]  category   Log category
+ * @param[in]  format     Format string compatible with printf
+ * @param[in]  arguments  Argument list
+ */
+ZONE_EXPORT void zone_vlog(
+  zone_parser_t *parser,
+  uint32_t category,
+  const char *format,
+  va_list arguments)
+zone_nonnull((1,3));
+
+ZONE_EXPORT inline void
+zone_nonnull((1,2))
+zone_format_printf(2,3)
+zone_error(zone_parser_t *parser, const char *format, ...)
+{
+  if (!(parser->options.log.categories & ZONE_ERROR))
+    return;
+  va_list arguments;
+  va_start(arguments, format);
+  zone_vlog(parser, ZONE_ERROR, format, arguments);
+  va_end(arguments);
+}
+
+ZONE_EXPORT inline void
+zone_nonnull((1,2))
+zone_format_printf(2,3)
+zone_warning(zone_parser_t *parser, const char *format, ...)
+{
+  if (!(parser->options.log.categories & ZONE_WARNING))
+    return;
+  va_list arguments;
+  va_start(arguments, format);
+  zone_vlog(parser, ZONE_WARNING, format, arguments);
+  va_end(arguments);
+}
+
+ZONE_EXPORT inline void
+zone_nonnull((1,2))
+zone_format_printf(2,3)
+zone_info(zone_parser_t *parser, const char *format, ...)
+{
+  if (!(parser->options.log.categories & ZONE_INFO))
+    return;
+  va_list arguments;
+  va_start(arguments, format);
+  zone_vlog(parser, ZONE_INFO, format, arguments);
+  va_end(arguments);
+}
+
+
 #if defined(__cplusplus)
 }
 #endif

src/zone.c

@@ -421,9 +421,6 @@ static void print_message(
   fprintf(output, format, parser->file->name, parser->file->line, message);
 }
 
-diagnostic_push()
-clang_diagnostic_ignored(missing-prototypes)
-
 void zone_vlog(
   zone_parser_t *parser,
   uint32_t category,
@@ -444,8 +441,6 @@ void zone_vlog(
   callback(parser, category, message, parser->user_data);
 }
 
-diagnostic_pop()
-
 void zone_log(
   zone_parser_t *parser,
   uint32_t category,
@@ -461,3 +456,12 @@ void zone_log(
   zone_vlog(parser, category, format, arguments);
   va_end(arguments);
 }
+
+extern inline void
+zone_error(zone_parser_t *parser, const char *format, ...);
+
+extern inline void
+zone_warning(zone_parser_t *parser, const char *format, ...);
+
+extern inline void
+zone_info(zone_parser_t *parser, const char *format, ...);