Fixup pairparsevalue signature (should return bool)

Fix places which assumed because it returned an int, it would return a negative integer to indicate failure.

diff --git a/src/include/libradius.h b/src/include/libradius.h
index 8c853c0..cceaba3 100644 (file)
--- a/src/include/libradius.h
+++ b/src/include/libradius.h
@@ -504,8 +504,8 @@ void                pairsprintf(VALUE_PAIR *vp, char const * fmt, ...)
 ;
 void           pairmove(TALLOC_CTX *ctx, VALUE_PAIR **to, VALUE_PAIR **from);
 void           pairfilter(TALLOC_CTX *ctx, VALUE_PAIR **to, VALUE_PAIR **from,
-                         unsigned int attr, unsigned int vendor, int8_t tag);
-int            pairparsevalue(VALUE_PAIR *vp, char const *value);
+                                          unsigned int attr, unsigned int vendor, int8_t tag);
+bool           pairparsevalue(VALUE_PAIR *vp, char const *value);
 VALUE_PAIR     *pairmake(TALLOC_CTX *ctx, VALUE_PAIR **vps, char const *attribute, char const *value, FR_TOKEN op);
 int            pairmark_xlat(VALUE_PAIR *vp, char const *value);
 FR_TOKEN       pairread(char const **ptr, VALUE_PAIR_RAW *raw);

diff --git a/src/lib/valuepair.c b/src/lib/valuepair.c
index a268ccb..c37e842 100644 (file)
--- a/src/lib/valuepair.c
+++ b/src/lib/valuepair.c
@@ -1418,7 +1418,7 @@ static int check_for_whitespace(char const *value)
 }
 
 
-int pairparsevalue(VALUE_PAIR *vp, char const *value)
+bool pairparsevalue(VALUE_PAIR *vp, char const *value)
 {
        char            *p;
        char const      *cp, *cs;

diff --git a/src/modules/rlm_sql/sql.c b/src/modules/rlm_sql/sql.c
index e1298bf..beb1cb6 100644 (file)
--- a/src/modules/rlm_sql/sql.c
+++ b/src/modules/rlm_sql/sql.c
@@ -254,7 +254,7 @@ int sql_userparse(TALLOC_CTX *ctx, VALUE_PAIR **head, rlm_sql_row_t row)
                        return -1;
                }
        } else {
-               if (pairparsevalue(vp, value) < 0) {
+               if (!pairparsevalue(vp, value)) {
                        ERROR("rlm_sql: Error parsing value");
 
                        pairbasicfree(vp);
@@ -452,7 +452,7 @@ void rlm_sql_query_log(rlm_sql_t *inst, REQUEST *request,
        } else {
                filename = inst->config->logfile;
        }
-       
+
        if (!filename) {
                return;
        }