From: Arran Cudbard-Bell Date: Wed, 5 Apr 2023 01:31:06 +0000 (-0600) Subject: clang scan fixes X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83a45ae89532704ec0f35cbd18d1c3425e4e1cea;p=thirdparty%2Ffreeradius-server.git clang scan fixes --- diff --git a/src/lib/curl/io.c b/src/lib/curl/io.c index 0486326ab32..b1cba5fa686 100644 --- a/src/lib/curl/io.c +++ b/src/lib/curl/io.c @@ -575,7 +575,7 @@ fr_curl_handle_t *fr_curl_io_init(TALLOC_CTX *ctx, CURLMcode ret; CURLM *mandle; fr_curl_handle_t *mhandle; - char const *option = "unknown"; + char const *option; mandle = curl_multi_init(); if (!mandle) { diff --git a/src/lib/server/log.c b/src/lib/server/log.c index 98d4e193a50..b5909a864d5 100644 --- a/src/lib/server/log.c +++ b/src/lib/server/log.c @@ -297,7 +297,7 @@ void vlog_request(fr_log_type_t type, fr_log_lvl_t lvl, request_t *request, char const *fmt_location = ""; char const *fmt_prefix = ""; char const *fmt_module = ""; - char const *fmt_exp = ""; + char const *fmt_exp; fr_log_t *log_dst = uctx; TALLOC_CTX *pool; diff --git a/src/lib/util/event.c b/src/lib/util/event.c index 42fe9633969..5639b386471 100644 --- a/src/lib/util/event.c +++ b/src/lib/util/event.c @@ -1389,14 +1389,18 @@ static int _event_timer_free(fr_event_timer_t *ev) (void) fr_dlist_remove(&el->ev_to_add, ev); } else { int ret = fr_lst_extract(el->times, ev); - char const *err_file = "not-available"; - int err_line = 0; + char const *err_file; + int err_line; #ifndef NDEBUG err_file = ev->file; err_line = ev->line; +#else + err_file = "not-available"; + err_line = 0; #endif + /* * Events MUST be in the lst (or the insertion list). */ @@ -1504,14 +1508,17 @@ int _fr_event_timer_at(NDEBUG_LOCATION_ARGS */ if (!fr_dlist_entry_in_list(&ev->entry)) { int ret; - char const *err_file = "not-available"; - int err_line = 0; + char const *err_file; + int err_line; ret = fr_lst_extract(el->times, ev); #ifndef NDEBUG err_file = ev->file; err_line = ev->line; +#else + err_file = "not-available"; + err_line = 0; #endif /* diff --git a/src/modules/rlm_rest/rest.c b/src/modules/rlm_rest/rest.c index 9bf2faea9f3..c878d09e904 100644 --- a/src/modules/rlm_rest/rest.c +++ b/src/modules/rlm_rest/rest.c @@ -1736,7 +1736,7 @@ int rest_request_config(module_ctx_t const *mctx, rlm_rest_section_t const *sect http_auth_type_t auth = section->auth; CURLcode ret = CURLE_OK; - char const *option = "unknown"; + char const *option; char buffer[512]; bool content_type_set = false;