diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-10-22 19:45:39 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-10-22 19:45:39 +0000 |
| commit | 82cbe0bd521fca4d6e20d1a7a00da1441b1fc574 (patch) | |
| tree | 6068c583241d2b33593a99b5d5ae2a30d2ce8a87 | |
| parent | 78481c32749fa575de5439bc4875293a4f9cc03b (diff) | |
Fix some callerid output
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@4050 f38db490-d61c-443f-a65b-d21fe96a405b
| -rwxr-xr-x | apps/app_voicemail.c | 4 | ||||
| -rwxr-xr-x | callerid.c | 6 | ||||
| -rwxr-xr-x | include/asterisk/callerid.h | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index bd01be0fe..d1bdd8275 100755 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -764,7 +764,7 @@ static void prep_email_sub_vars(struct ast_channel *ast, struct ast_vm_user *vmu snprintf(passdata, passdatasize, "%d", msgnum); pbx_builtin_setvar_helper(ast, "VM_MSGNUM", passdata); pbx_builtin_setvar_helper(ast, "VM_MAILBOX", mailbox); - pbx_builtin_setvar_helper(ast, "VM_CALLERID", ast_callerid_merge(callerid, sizeof(callerid), cidname, cidnum)); + pbx_builtin_setvar_helper(ast, "VM_CALLERID", ast_callerid_merge(callerid, sizeof(callerid), cidname, cidnum, "Unknown Caller")); pbx_builtin_setvar_helper(ast, "VM_CIDNAME", (cidname ? cidname : "an unknown caller")); pbx_builtin_setvar_helper(ast, "VM_CIDNUM", (cidnum ? cidnum : "an unknown caller")); pbx_builtin_setvar_helper(ast, "VM_DATE", date); @@ -1395,7 +1395,7 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, int silent, int chan->exten, chan->priority, chan->name, - ast_callerid_merge(callerid, sizeof(callerid), chan->cid.cid_name, chan->cid.cid_num), + ast_callerid_merge(callerid, sizeof(callerid), chan->cid.cid_name, chan->cid.cid_num, "Unknown"), date, (long)time(NULL)); fclose(txt); } else 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) diff --git a/include/asterisk/callerid.h b/include/asterisk/callerid.h index 4008192c8..a10b2cb7d 100755 --- a/include/asterisk/callerid.h +++ b/include/asterisk/callerid.h @@ -165,7 +165,7 @@ extern int ast_isphonenumber(char *n); extern int ast_callerid_split(const char *src, char *name, int namelen, char *num, int numlen); -extern char *ast_callerid_merge(char *buf, int bufsiz, const char *name, const char *num); +extern char *ast_callerid_merge(char *buf, int bufsiz, const char *name, const char *num, const char *unknown); /* * Caller*ID and other GR-30 compatible generation |