Rearrange code to quiet clang analyzer

diff --git a/src/modules/rlm_sql/sql.c b/src/modules/rlm_sql/sql.c
index 92bf7ea..8dc6d5d 100644 (file)
--- a/src/modules/rlm_sql/sql.c
+++ b/src/modules/rlm_sql/sql.c
@@ -310,7 +310,7 @@ int rlm_sql_fetch_row(rlm_sql_handle_t **handle, rlm_sql_t *inst)
  *************************************************************************/
 int rlm_sql_query(rlm_sql_handle_t **handle, rlm_sql_t *inst, char const *query)
 {
-       int ret;
+       int ret = -1;
 
        /*
         *      If there's no query, return an error.
@@ -320,7 +320,6 @@ int rlm_sql_query(rlm_sql_handle_t **handle, rlm_sql_t *inst, char const *query)
        }
 
        if (!*handle || !(*handle)->conn) {
-               ret = -1;
                goto sql_down;
        }
 
@@ -360,7 +359,7 @@ int rlm_sql_query(rlm_sql_handle_t **handle, rlm_sql_t *inst, char const *query)
  *************************************************************************/
 int rlm_sql_select_query(rlm_sql_handle_t **handle, rlm_sql_t *inst, char const *query)
 {
-       int ret;
+       int ret = -1;
 
        /*
         *      If there's no query, return an error.
@@ -370,7 +369,6 @@ int rlm_sql_select_query(rlm_sql_handle_t **handle, rlm_sql_t *inst, char const
        }
 
        if (!*handle || !(*handle)->conn) {
-               ret = -1;
                goto sql_down;
        }