Filter: fix unit tests and many warnings

Author: sedmicha

include/libfds/filter.h

@@ -5,7 +5,7 @@
  * \date 2020
  */
 
-/* 
+/*
  * Copyright (C) 2020 CESNET, z.s.p.o.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -51,13 +51,13 @@ extern "C" {
 
 #include <stdbool.h>
 #include <stdint.h>
-#include <stdlib.h>  
+#include <stdlib.h>
 
 typedef struct fds_filter_error {
     /** The error code                                                         */
     int code;
     /** The error message                                                      */
-    const char *msg;
+    char *msg;
 
     /** Location of the error, both can be NULL depending on the type of error */
     /** Pointer to the beginning of the error location in the input expression */
@@ -86,15 +86,15 @@ typedef enum fds_filter_datatype {
 
     FDS_FDT_FLAGS,
 
-    FDS_FDT_CUSTOM = 1 << 29, /**< Bit that indicates that the data type is custom      */ 
+    FDS_FDT_CUSTOM = 1 << 29, /**< Bit that indicates that the data type is custom      */
     FDS_FDT_LIST = 1 << 30,   /**< Bit that indicates that the data type is a list      */
 } fds_filter_datatype_e;
 
 typedef union fds_filter_value fds_filter_value_u; /**< Forward declaration because of list */
 
 /** The IP address type */
 typedef struct fds_filter_ip {
-    /** The IP address version, 4 or 6   */ 
+    /** The IP address version, 4 or 6   */
     uint8_t version;
     /** The prefix length of the address */
     uint8_t prefix;
@@ -161,25 +161,25 @@ typedef struct fds_filter_opts fds_filter_opts_t;
  *
  * \param[in]  user_ctx      The user context set by fds_filter_set_user_ctx
  * \param[in]  name          The name of the identifier
- * \param[in]  other_name    The name of the first identifier on the other side if any 
+ * \param[in]  other_name    The name of the first identifier on the other side if any
  * \param[out] out_id        The id of the identifier that will be passed to the const/data callbacks.
  * \param[out] out_datatype  The data type of the identifier
- * \param[out] out_flags     The identifier flags. If set to FDS_FILTER_CONST_FLAG the identifier 
+ * \param[out] out_flags     The identifier flags. If set to FDS_FILTER_CONST_FLAG the identifier
  *                           will be considered constant and the const callback will be used.
  *
- * \return  FDS_OK on success, 
+ * \return  FDS_OK on success,
  *          FDS_NOTFOUND if the identifier name is not recognized, which results in a filter error
  */
 typedef int fds_filter_lookup_cb_t(
     void *user_ctx, const char *name, const char *other_name, int *out_id, int *out_datatype, int *out_flags);
 
 /**
- * Get the value of a constant. 
- * An identifier is a constant if the FDS_FILTER_CONST_FLAG was set in the lookup callback. 
+ * Get the value of a constant.
+ * An identifier is a constant if the FDS_FILTER_CONST_FLAG was set in the lookup callback.
  *
  * \param[in]  user_ctx   The user context set by fds_filter_set_user_ctx
- * \param[in]  id         The id provided by the user in the lookup callback 
- * \param[out] out_value  The value of the constant 
+ * \param[in]  id         The id provided by the user in the lookup callback
+ * \param[out] out_value  The value of the constant
  *
  */
 typedef void fds_filter_const_cb_t(void *user_ctx, int id, fds_filter_value_u *out_value);
@@ -214,6 +214,9 @@ enum fds_filter_fds_filter_ast_flags_e {
 
 typedef struct fds_filter_ast_node {
     const char *symbol;
+
+#pragma GCC diagnostic ignored "-Wpedantic"
+// Anonymous unions and structs are not ISO C++ compliant
     union {
         struct {
             struct fds_filter_ast_node *left;
@@ -225,6 +228,7 @@ typedef struct fds_filter_ast_node {
             struct fds_filter_ast_node *next;
         };
     };
+#pragma GCC diagnostic pop
 
     struct fds_filter_ast_node *parent;
 
@@ -239,7 +243,7 @@ typedef struct fds_filter_ast_node {
     // the position of the node in the input text, for error message purposes
     const char *cursor_begin;
     const char *cursor_end;
-    
+
 } fds_filter_ast_node_s;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -250,42 +254,42 @@ typedef struct fds_filter_ast_node {
 
 /**
  * Binary operation function type
- * 
+ *
  * \param[in]  arg1    The first (left) arg
  * \param[in]  arg2    The second (right) arg
  * \param[out] result  The output value
- */ 
+ */
 typedef void fds_filter_binary_fn_t(fds_filter_value_u *arg1, fds_filter_value_u *arg2, fds_filter_value_u *result);
 
 /**
  * Unary operation function type
- * 
+ *
  * \param[in]  arg1    The first (left) arg
  * \param[out] result  The output value
- */ 
+ */
 typedef void fds_filter_unary_fn_t(fds_filter_value_u *arg, fds_filter_value_u *result);
 
 /**
  * Cast function type
- * 
+ *
  * \param[in]  arg     The input value
  * \param[out] result  The output value
- */ 
+ */
 typedef void fds_filter_cast_fn_t(fds_filter_value_u *arg, fds_filter_value_u *result);
 
 /**
  * Constructor function type
- * 
+ *
  * \param[in]  arg     The input value
  * \param[out] result  The output value
- * 
+ *
  * \return FDS_OK on success, error code on failure
  */
 typedef int fds_filter_constructor_fn_t(fds_filter_value_u *arg, fds_filter_value_u *result);
 
 /**
  * Destructor function type
- * 
+ *
  * \param[in] arg  The value to destruct
  */
 typedef void fds_filter_destructor_fn_t(fds_filter_value_u *arg);
@@ -295,13 +299,17 @@ typedef struct fds_filter_op {
     int out_dt;
     int arg1_dt;
     int arg2_dt;
+
+#pragma GCC diagnostic ignored "-Wpedantic"
+// Anonymous unions and structs are not ISO C++ compliant
     union {
         fds_filter_unary_fn_t *unary_fn;
         fds_filter_binary_fn_t *binary_fn;
         fds_filter_cast_fn_t *cast_fn;
         fds_filter_constructor_fn_t *constructor_fn;
         fds_filter_destructor_fn_t *destructor_fn;
     };
+#pragma GCC diagnostic pop
 } fds_filter_op_s;
 
 
@@ -312,15 +320,15 @@ typedef struct fds_filter_op {
       .arg2_dt        = (RIGHT_DT),                                       \
       .out_dt         = (OUT_DT),                                         \
       .binary_fn      = (FUNC)                                            \
-    }                        
+    }
 #define FDS_FILTER_DEF_UNARY_OP(SYMBOL, OPERAND_DT, FUNC, OUT_DT)         \
     {                                                                     \
       .symbol         = (SYMBOL),                                         \
       .arg1_dt        = (OPERAND_DT),                                     \
       .arg2_dt        = FDS_FDT_NONE,                                     \
       .out_dt         = (OUT_DT),                                         \
       .unary_fn       = (FUNC)                                            \
-    }                        
+    }
 #define FDS_FILTER_DEF_CAST(FROM_DT, FUNC, TO_DT)                         \
     {                                                                     \
       .symbol         = "__cast__",                                       \
@@ -355,16 +363,16 @@ typedef struct fds_filter_op {
 
 /**
  * Creates the default options structure.
- * Because one options can be used by multiple filters, it has to be freed separately from the filter. 
- * 
+ * Because one options can be used by multiple filters, it has to be freed separately from the filter.
+ *
  * \return the options or NULL on memory error
  */
 FDS_API fds_filter_opts_t *
 fds_filter_create_default_opts();
 
 /**
  * Sets the lookup callback
- * 
+ *
  * \param[inout] opts  The options structure
  * \param[in]    cb    The callback
  */
@@ -373,7 +381,7 @@ fds_filter_opts_set_lookup_cb(fds_filter_opts_t *opts, fds_filter_lookup_cb_t *c
 
 /**
  * Sets the const callback
- * 
+ *
  * \param[inout] opts  The options structure
  * \param[in]    cb    The callback
  */
@@ -382,7 +390,7 @@ fds_filter_opts_set_const_cb(fds_filter_opts_t *opts, fds_filter_const_cb_t *cb)
 
 /**
  * Sets the data callback
- * 
+ *
  * \param[in] opts  The options structure
  * \param[in] cb    The callback
  */
@@ -391,37 +399,37 @@ fds_filter_opts_set_data_cb(fds_filter_opts_t *opts, fds_filter_data_cb_t *cb);
 
 /**
  * Adds a filter operation
- * 
+ *
  * \param[in] opts  The options structure
  * \param[in] op    The operation
- * 
+ *
  * \return pointer to the new op on success, NULL on failure
- */ 
+ */
 FDS_API fds_filter_op_s *
 fds_filter_opts_add_op(fds_filter_opts_t *opts, fds_filter_op_s op);
 
 /**
  * Adds multiple filter operation
- * 
+ *
  * \param[in] opts    The options structure
  * \param[in] ops     The operations with a FDS_FILTER_END_OP_LIST marking the end
- * 
+ *
  * \return pointer to the first new op on success, NULL on failure
- */ 
+ */
 FDS_API fds_filter_op_s *
 fds_filter_opts_extend_ops(fds_filter_opts_t *opts, const fds_filter_op_s *ops);
 
 /**
  * Destroys the options structure
- * 
+ *
  * \param[in] opts  The options structure
  */
 FDS_API void
 fds_filter_destroy_opts(fds_filter_opts_t *opts);
 
 /**
  * Set the user context
- * 
+ *
  * \param[in] opts      The opts
  * \param[in] user_ctx  The user context
  */
@@ -430,7 +438,7 @@ fds_filter_opts_set_user_ctx(fds_filter_opts_t *opts, void *user_ctx);
 
 /**
  * Get the user context
- * 
+ *
  * \param[in] opts   The opts
  * \return the user context
  */
@@ -445,15 +453,15 @@ fds_filter_opts_get_user_ctx(const fds_filter_opts_t *opts);
 // Main API
 
 /**
- * 
+ *
  * Creates the filter from an expression.
  *
  * \param[out] filter   Pointer to where to allocate and construct the filter
  * \param[in]  expr     The filter expression
  * \param[in]  opts     The filter options
- * 
- * User context is an arbitary pointer provided by the user that's passed to all subsequent 
- * data callback calls as the user_ctx argument. It's intended to carry information about state 
+ *
+ * User context is an arbitary pointer provided by the user that's passed to all subsequent
+ * data callback calls as the user_ctx argument. It's intended to carry information about state
  * that's required for the data callback function to correctly parse the data.
  *
  * On error, more detailed information about the error can be obtained using fds_filter_get_error.
@@ -466,30 +474,30 @@ fds_filter_create(fds_filter_t **filter, const char *expr, const fds_filter_opts
 
 /**
  * Evaluates the filter on the provided data.
- * 
+ *
  * \param[in] filter  The filter
- * \param[in] data    The data 
+ * \param[in] data    The data
  *
- * \return true if the data passes the filter, false if not 
+ * \return true if the data passes the filter, false if not
  */
 FDS_API bool
 fds_filter_eval(fds_filter_t *filter, void *data);
 
 /**
  * Destroys the filter.
- * 
+ *
  * \param[in] filter  The filter to be destroyed.
  */
 FDS_API void
 fds_filter_destroy(fds_filter_t *filter);
 
 /**
  * Gets the error from a filter.
- * 
+ *
  * If the filter parameter is NULL then memory error is assumed.
- * 
+ *
  * \param[in] filter  The filter
- * 
+ *
  * \return Pointer to the error, or NULL if there is no error.
  */
 FDS_API fds_filter_error_s *

src/filter/ast_common.h

@@ -4,8 +4,8 @@
  * \brief Common AST functions file
  * \date 2020
  */
- 
-/* 
+
+/*
  * Copyright (C) 2020 CESNET, z.s.p.o.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -158,7 +158,7 @@ print_ast_nodes_recursively(FILE *out, fds_filter_ast_node_s *ast, int depth)
         fprintf(out, " (destroy value)");
     }
 
-    fprintf(out, ", ptr: %p, parent: %p", ast, ast->parent);
+    fprintf(out, ", ptr: %p, parent: %p", (void *) ast, (void *) ast->parent);
 
     if (ast->left || ast->right) {
         fprintf(out, "\n");

src/filter/error.c

@@ -5,7 +5,7 @@
  * \date 2020
  */
 
-/* 
+/*
  * Copyright (C) 2020 CESNET, z.s.p.o.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -44,8 +44,8 @@
 
 const fds_filter_error_s memory_error = { .code = FDS_ERR_NOMEM, .msg = "out of memory" };
 
-const error_t NO_ERROR = NULL;
-const error_t MEMORY_ERROR = &memory_error;
+error_t const NO_ERROR = NULL;
+error_t const MEMORY_ERROR = &memory_error;
 
 error_t
 error_create_variadic(int code, const char *fmt, va_list args)
@@ -54,7 +54,7 @@ error_create_variadic(int code, const char *fmt, va_list args)
     va_copy(args_, args);
     size_t msg_len = vsnprintf(NULL, 0, fmt, args_);
     error_t err = malloc(sizeof(fds_filter_error_s));
-    if (!err) { 
+    if (!err) {
         va_end(args_);
         return MEMORY_ERROR;
     }