proto: Let unmarshal functions return the number of bytes processed.

[sysdb.git] / src / core / store_lookup.c

diff --git a/src/core/store_lookup.c b/src/core/store_lookup.c
index b80a18fdd1cdad47372afb9e7fd0cc4efbfb3bce..a95f5877d38011dff4788e4655e8616bc27d420a 100644 (file)
--- a/src/core/store_lookup.c
+++ b/src/core/store_lookup.c
@@ -92,7 +92,7 @@ expr_free_datum2(sdb_store_expr_t *e1, sdb_data_t *v1,
  * is enabled, compare the string values in case of a type mismatch.
  */
 static int
-match_cmp_value(int op, sdb_data_t *v1, sdb_data_t *v2, _Bool strcmp_fallback)
+match_cmp_value(int op, sdb_data_t *v1, sdb_data_t *v2, bool strcmp_fallback)
 {
        int status;
 
@@ -107,18 +107,14 @@ match_cmp_value(int op, sdb_data_t *v1, sdb_data_t *v2, _Bool strcmp_fallback)
 
        if (status == INT_MAX)
                return 0;
-       else if (op == MATCHER_LT)
-               return status < 0;
-       else if (op == MATCHER_LE)
-               return status <= 0;
-       else if (op == MATCHER_EQ)
-               return status == 0;
-       else if (op == MATCHER_NE)
-               return status != 0;
-       else if (op == MATCHER_GE)
-               return status >= 0;
-       else if (op == MATCHER_GT)
-               return status > 0;
+       switch (op) {
+               case MATCHER_LT: return status < 0;
+               case MATCHER_LE: return status <= 0;
+               case MATCHER_EQ: return status == 0;
+               case MATCHER_NE: return status != 0;
+               case MATCHER_GE: return status >= 0;
+               case MATCHER_GT: return status > 0;
+       }
        return 0;
 } /* match_cmp_value */
 
@@ -157,7 +153,7 @@ match_regex_value(int op, sdb_data_t *v, sdb_data_t *re)
 } /* match_regex_value */
 
 static int
-match_value(int op, sdb_data_t *v1, sdb_data_t *v2, _Bool strcmp_fallback)
+match_value(int op, sdb_data_t *v1, sdb_data_t *v2, bool strcmp_fallback)
 {
        if ((op == MATCHER_REGEX) || (op == MATCHER_NREGEX))
                return match_regex_value(op, v1, v2);