From c224c44a16130d7d7d2a086d7c660181345c9793 Mon Sep 17 00:00:00 2001 From: Matthew Jordan Date: Tue, 7 Apr 2015 01:58:57 +0000 Subject: [PATCH] clang compiler warnings: Fix non-literal-null-conversion warnings Clang will flag errors when a char pointer is set to '\0', as opposed to a value that the char pointer points to. This patch fixes this warning in a variety of locations. Review: https://reviewboard.asterisk.org/r/4551 ASTERISK-24917 Reported by: dkdegroot patches: rb4551.patch submitted by dkdegroot (License 6600) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@434187 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 4 ++-- channels/chan_skinny.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index e4c1069cee..6a208cc142 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -19496,13 +19496,13 @@ static void cleanup_stale_contexts(char *new, char *old) char *oldcontext, *newcontext, *stalecontext, *stringp, newlist[AST_MAX_CONTEXT]; while ((oldcontext = strsep(&old, "&"))) { - stalecontext = '\0'; + stalecontext = NULL; ast_copy_string(newlist, new, sizeof(newlist)); stringp = newlist; while ((newcontext = strsep(&stringp, "&"))) { if (!strcmp(newcontext, oldcontext)) { /* This is not the context you're looking for */ - stalecontext = '\0'; + stalecontext = NULL; break; } else if (strcmp(newcontext, oldcontext)) { stalecontext = oldcontext; diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index 6aa94a9b37..e5f2afb973 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -2024,13 +2024,13 @@ static void cleanup_stale_contexts(char *new, char *old) char *oldcontext, *newcontext, *stalecontext, *stringp, newlist[AST_MAX_CONTEXT]; while ((oldcontext = strsep(&old, "&"))) { - stalecontext = '\0'; + stalecontext = NULL; ast_copy_string(newlist, new, sizeof(newlist)); stringp = newlist; while ((newcontext = strsep(&stringp, "&"))) { if (strcmp(newcontext, oldcontext) == 0) { /* This is not the context you're looking for */ - stalecontext = '\0'; + stalecontext = NULL; break; } else if (strcmp(newcontext, oldcontext)) { stalecontext = oldcontext; -- 2.47.3