git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1621 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
a05adac17e
commit
1b1186d189
|
@ -110,8 +110,8 @@ struct callerid_state *callerid_new(void)
|
|||
{
|
||||
struct callerid_state *cid;
|
||||
cid = malloc(sizeof(struct callerid_state));
|
||||
memset(cid, 0, sizeof(struct callerid_state));
|
||||
if (cid) {
|
||||
memset(cid, 0, sizeof(struct callerid_state));
|
||||
cid->fskd.spb = 7; /* 1200 baud */
|
||||
cid->fskd.hdlc = 0; /* Async */
|
||||
cid->fskd.nbit = 8; /* 8 bits */
|
||||
|
|
|
@ -4359,6 +4359,8 @@ static void *ss_thread(void *data)
|
|||
} else
|
||||
ast_log(LOG_WARNING, "Unable to get caller ID space\n");
|
||||
}
|
||||
else
|
||||
cs = NULL;
|
||||
if (name && number) {
|
||||
snprintf(cid, sizeof(cid), "\"%s\" <%s>", name, number);
|
||||
} else if (name) {
|
||||
|
@ -4368,6 +4370,8 @@ static void *ss_thread(void *data)
|
|||
} else {
|
||||
strcpy(cid, "");
|
||||
}
|
||||
if (cs)
|
||||
callerid_free(cs);
|
||||
if (strlen(cid)) {
|
||||
chan->callerid = strdup(cid);
|
||||
chan->ani = strdup(cid);
|
||||
|
|
3
frame.c
3
frame.c
|
@ -455,8 +455,7 @@ static int show_codecs(int fd, int argc, char *argv[])
|
|||
return RESULT_SHOWUSAGE;
|
||||
|
||||
if (getenv("I_AM_NOT_AN_IDIOT") == NULL)
|
||||
ast_cli(fd, "Disclaimer: this command is for informational purposes
|
||||
only.\n\tIt does not indicate anything about your configuration.\n");
|
||||
ast_cli(fd, "Disclaimer: this command is for informational purposes only.\n\tIt does not indicate anything about your configuration.\n");
|
||||
|
||||
if ((argc == 2) || (!strcasecmp(argv[1],"audio"))) {
|
||||
found = 1;
|
||||
|
|
Reference in New Issue