summaryrefslogtreecommitdiff
path: root/callerid.c
diff options
context:
space:
mode:
authorMark Spencer <markster@digium.com>2004-10-22 19:45:39 +0000
committerMark Spencer <markster@digium.com>2004-10-22 19:45:39 +0000
commitc4da80e6e0482ac6a7d370df54bc922ee26080aa (patch)
tree6068c583241d2b33593a99b5d5ae2a30d2ce8a87 /callerid.c
parent9f0d70a9e689941026b187f566c4ec6bdb7f2a7e (diff)
Fix some callerid output
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4050 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'callerid.c')
-rwxr-xr-xcallerid.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/callerid.c b/callerid.c
index b5b55e14f..82b240048 100755
--- a/callerid.c
+++ b/callerid.c
@@ -679,8 +679,10 @@ int ast_callerid_callwaiting_generate(unsigned char *buf, char *name, char *numb
return __ast_callerid_generate(buf, name, number, 1, codec);
}
-char *ast_callerid_merge(char *buf, int bufsiz, const char *name, const char *num)
+char *ast_callerid_merge(char *buf, int bufsiz, const char *name, const char *num, const char *unknown)
{
+ if (!unknown)
+ unknown = "<unknown>";
if (name && num)
snprintf(buf, bufsiz, "\"%s\" <%s>", name, num);
else if (name)
@@ -688,7 +690,7 @@ char *ast_callerid_merge(char *buf, int bufsiz, const char *name, const char *nu
else if (num)
strncpy(buf, num, bufsiz - 1);
else
- strncpy(buf, "<unknown>", bufsiz - 1);
+ strncpy(buf, unknown, bufsiz - 1);
return buf;
}
int ast_callerid_split(const char *buf, char *name, int namelen, char *num, int numlen)