MT#55283 fix compiler warnings

Change-Id: Idd4162cbcdddead57b730f773289786b7b4cf3fe
(cherry picked from commit fda6cbf8b1)

daemon/call.c

@@ -447,6 +447,7 @@ void kill_calls_timer(GSList *list, const char *url) {
 	call_t *ca;
 	struct call_monologue *cm;
 	char *url_prefix = NULL, *url_suffix = NULL;
+	const char *needle;
 	struct xmlrpc_helper *xh = NULL;
 	char url_buf[128];
 
@@ -457,10 +458,10 @@ void kill_calls_timer(GSList *list, const char *url) {
 	if (url) {
 		xh = g_new(__typeof(*xh), 1);
 		url_prefix = NULL;
-		url_suffix = strstr(url, "%%");
-		if (url_suffix) {
-			url_prefix = strndup(url, url_suffix - url);
-			url_suffix = strdup(url_suffix + 2);
+		needle = strstr(url, "%%");
+		if (needle) {
+			url_prefix = strndup(url, needle - url);
+			url_suffix = strdup(needle + 2);
 		}
 		else
 			url_suffix = strdup(url);

recording-daemon/decoder.c

@@ -24,7 +24,7 @@
 
 // does not initialise the contained `sink`
 decode_t *decoder_new(const char *payload_str, const char *format, int ptime) {
-	char *slash = strchr(payload_str, '/');
+	const char *slash = strchr(payload_str, '/');
 	if (!slash) {
 		ilog(LOG_WARN, "Invalid payload format: %s", payload_str);
 		return NULL;

recording-daemon/output.c

@@ -261,13 +261,13 @@ static output_t *output_new(const char *path, const metafile_t *mf, const char *
 			case '{':
 				// find matching end '}'
 				p++;
-				end = strchr(p, '}');
-				if (!end) {
+				const char *cend = strchr(p, '}');
+				if (!cend) {
 					ilog(LOG_ERR, "Missing ending brace '}' in file name pattern");
 					break;
 				}
-				str fmt = STR_LEN((char *) p, end - p);
-				p = end; // skip over {...}
+				str fmt = STR_LEN((char *) p, cend - p);
+				p = cend; // skip over {...}
 				output_append_str_from_ht(f, mf->metadata_parsed, &fmt);
 				break;
 			default: