TELECOM-11880: Build compilation updates

Author: davidtrihy-genesys

modules/rest_client/rest_client.c

@@ -255,9 +255,9 @@ static const trans_export_t trans[] = {
 
 static int warm_pool_urls(modparam_t type, void *val) {
 	unsigned int num_conns;
-	char *mod_param, *delim, *host;
+	char *mod_param, *delim, *host = NULL;
 	size_t delim_index, string_end;
-	preconnect_urls *tmp;
+	preconnect_urls *tmp = NULL;
 	str num_conns_s;
 
 	if (!share_connections) {

modules/rest_client/rest_methods.c

@@ -185,7 +185,7 @@ int rcl_init_internals(void)
 #define w_curl_multi_setopt(mh, opt, value) \
 	do { \
 		mrc = curl_multi_setopt(mh, opt, value); \
-		if (mrc != CURLE_OK) { \
+		if (mrc != CURLM_OK) { \
 			LM_ERR("curl_multi_setopt(%d): (%s)\n", opt, curl_multi_strerror(mrc)); \
 			goto cleanup; \
 		} \
@@ -194,7 +194,7 @@ int rcl_init_internals(void)
 #define w_curl_share_setopt(cs, opt, value) \
 	do { \
 		src = curl_share_setopt(cs, opt, value); \
-		if (src != CURLE_OK) { \
+		if (src != CURLSHE_OK) { \
 			LM_ERR("curl_share_setopt: %s\n", curl_share_strerror(src)); \
 			goto cleanup; \
 		} \
@@ -1606,8 +1606,7 @@ int connect_only(preconnect_urls *precon_urls, int total_cons) {
 	CURLMcode mrc;
 	CURL *handle;
 	CURLM *multi_handle;
-	OSS_CURLM *multi_list;
-	CURL **list;
+	OSS_CURLM *multi_list = NULL;
 	struct CURLMsg *m;
 	preconnect_urls *start, *next;
 	char *url;
@@ -1617,12 +1616,14 @@ int connect_only(preconnect_urls *precon_urls, int total_cons) {
 	curl_share = get_curl_share();
 
 	if (!curl_share) {
-		goto cleanup;
+		exit_code = -1;
+		goto done;
 	}
 
 	multi_list = get_multi();
 	if (!multi_list) {
-		goto cleanup;
+		exit_code = -1;
+		goto done;
 	}
 
 	multi_handle = multi_list->multi_handle;
@@ -1711,6 +1712,7 @@ int connect_only(preconnect_urls *precon_urls, int total_cons) {
 
 	put_multi(multi_list);
 
+done:
 	return exit_code;
 }
 
@@ -1724,7 +1726,7 @@ int start_async_http_req_v2(struct sip_msg *msg, enum rest_client_method method,
 	CURLMcode mrc;
 	OSS_CURLM *multi_list;
 	CURLM *multi_handle;
-	long busy_wait, timeout, connect_timeout, retry_time;
+	long busy_wait;
 
 	handle = curl_easy_init();
 
@@ -1801,7 +1803,6 @@ int start_async_http_req_v2(struct sip_msg *msg, enum rest_client_method method,
 
 	connect_timeout = (async_parm->timeout_s*1000) > connection_timeout_ms ?
 			(async_parm->timeout_s*1000) : connection_timeout_ms;
-	timeout = connect_timeout;
 	busy_wait = connect_poll_interval;
 
 	w_curl_multi_setopt(multi_handle, CURLMOPT_TIMERFUNCTION, timer_cb);