kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-19 19:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

more NULL "" equivalence in CLI fields.

Browse Source 
Mark a place where we don't clear a buffer while we probably should.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21820 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2006-04-21 10:51:31 +00:00
parent 4cef4ef720
commit 652ccf5037
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
funcs/func_callerid.c
View File

@@ -42,6 +42,7 @@ static int callerid_read(struct ast_channel *chan, char *cmd, char *data,
{ {
char *opt = data; char *opt = data;
/* XXX we are not always clearing the buffer. Is this correct ? */
if (strchr(opt, '|')) { if (strchr(opt, '|')) {
char name[80], num[80]; char name[80], num[80];
@@ -62,8 +63,8 @@ static int callerid_read(struct ast_channel *chan, char *cmd, char *data,
} else { } else {
if (!strncasecmp("all", data, 3)) { if (!strncasecmp("all", data, 3)) {
snprintf(buf, len, "\"%s\" <%s>", snprintf(buf, len, "\"%s\" <%s>",
chan->cid.cid_name ? chan->cid.cid_name : "", S_OR(chan->cid.cid_name, ""),
chan->cid.cid_num ? chan->cid.cid_num : ""); S_OR(chan->cid.cid_num, ""));
} else if (!strncasecmp("name", data, 4)) { } else if (!strncasecmp("name", data, 4)) {
if (chan->cid.cid_name) { if (chan->cid.cid_name) {
ast_copy_string(buf, chan->cid.cid_name, len); ast_copy_string(buf, chan->cid.cid_name, len);
@@ -116,12 +117,12 @@ static int callerid_write(struct ast_channel *chan, char *cmd, char *data,
/* do we need to lock chan here? */ /* do we need to lock chan here? */
if (chan->cid.cid_dnid) if (chan->cid.cid_dnid)
free(chan->cid.cid_dnid); free(chan->cid.cid_dnid);
chan->cid.cid_dnid = ast_strlen_zero(value) ? NULL : strdup(value); chan->cid.cid_dnid = ast_strdup(value);
} else if (!strncasecmp("rdnis", data, 5)) { } else if (!strncasecmp("rdnis", data, 5)) {
/* do we need to lock chan here? */ /* do we need to lock chan here? */
if (chan->cid.cid_rdnis) if (chan->cid.cid_rdnis)
free(chan->cid.cid_rdnis); free(chan->cid.cid_rdnis);
chan->cid.cid_rdnis = ast_strlen_zero(value) ? NULL : strdup(value); chan->cid.cid_rdnis = ast_strdup(value);
} else { } else {
ast_log(LOG_ERROR, "Unknown callerid data type.\n"); ast_log(LOG_ERROR, "Unknown callerid data type.\n");
} }