diff options
| author | Matthew Jordan <mjordan@digium.com> | 2015-04-07 02:03:20 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2015-04-07 02:03:20 +0000 |
| commit | c027133f6d564027ccbbfbbd21eddb9d17368439 (patch) | |
| tree | 0ee9cb8b92b9a0535b313671b0dadcdd75ece37e /channels | |
| parent | 2270c40d33827a605b500e7afe01be9976b1f5e0 (diff) | |
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)
........
Merged revisions 434187 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@434188 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 4 | ||||
| -rw-r--r-- | 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 4c25ec2af..b891eef7c 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -19738,13 +19738,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 6b16d6bef..fb51996ab 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -2185,13 +2185,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; |