kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Misc Grammer/formatting fixes - Thanks Corydon76! (bug #3361)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4827 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Josh Roberson
2005-01-17 22:53:36 +00:00
parent 840f035827
commit 7f887cca90
5 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
acl.c
View File

@@ -154,12 +154,12 @@ struct ast_ha *ast_append_ha(char *sense, char *stuff, struct ast_ha *path)
ha->netmask.s_addr = htonl(y); ha->netmask.s_addr = htonl(y);
} }
} else if (!inet_aton(nm, &ha->netmask)) { } else if (!inet_aton(nm, &ha->netmask)) {
ast_log(LOG_WARNING, "%s not a valid netmask\n", nm); ast_log(LOG_WARNING, "%s is not a valid netmask\n", nm);
free(ha); free(ha);
return path; return path;
} }
if (!inet_aton(tmp, &ha->netaddr)) { if (!inet_aton(tmp, &ha->netaddr)) {
ast_log(LOG_WARNING, "%s not a valid IP\n", tmp); ast_log(LOG_WARNING, "%s is not a valid IP\n", tmp);
free(ha); free(ha);
return path; return path;
} }

2
cdr.c
View File

@@ -209,7 +209,7 @@ int ast_cdr_disposition(struct ast_cdr *cdr, int cause)
break; break;
default: default:
res = -1; res = -1;
ast_log(LOG_WARNING, "We don't handle that cause yet\n"); ast_log(LOG_WARNING, "Cause not handled\n");
} }
cdr = cdr->next; cdr = cdr->next;
} }

4
channel.c
View File

@@ -916,7 +916,7 @@ int ast_waitfor_n_fd(int *fds, int n, int *ms, int *exception)
pfds = alloca(sizeof(struct pollfd) * n); pfds = alloca(sizeof(struct pollfd) * n);
if (!pfds) { if (!pfds) {
ast_log(LOG_WARNING, "alloca failed! bad things will happen.\n"); ast_log(LOG_ERROR, "Out of memory\n");
return -1; return -1;
} }
if (*ms > 0) if (*ms > 0)
@@ -981,7 +981,7 @@ struct ast_channel *ast_waitfor_nandfds(struct ast_channel **c, int n, int *fds,
pfds = alloca(sizeof(struct pollfd) * (n * AST_MAX_FDS + nfds)); pfds = alloca(sizeof(struct pollfd) * (n * AST_MAX_FDS + nfds));
if (!pfds) { if (!pfds) {
ast_log(LOG_WARNING, "alloca failed! bad things will happen.\n"); ast_log(LOG_ERROR, "Out of memory\n");
*outfd = -1; *outfd = -1;
return NULL; return NULL;
} }

48
channels/chan_sip.c
View File

@@ -5779,8 +5779,8 @@ static void receive_message(struct sip_pvt *p, struct sip_request *req)
/*--- sip_show_inuse: CLI Command to show calls within limits set by /*--- sip_show_inuse: CLI Command to show calls within limits set by
outgoinglimit and incominglimit ---*/ outgoinglimit and incominglimit ---*/
static int sip_show_inuse(int fd, int argc, char *argv[]) { static int sip_show_inuse(int fd, int argc, char *argv[]) {
#define FORMAT "%-15.15s %-15.15s %-15.15s %-15.15s %-15.15s\n" #define FORMAT "%-25.25s %-15.15s %-15.15s %-15.15s %-15.15s\n"
#define FORMAT2 "%-15.15s %-15.15s %-15.15s %-15.15s %-15.15s\n" #define FORMAT2 "%-25.25s %-15.15s %-15.15s %-15.15s %-15.15s\n"
char ilimits[40] = ""; char ilimits[40] = "";
char olimits[40] = ""; char olimits[40] = "";
char iused[40]; char iused[40];
@@ -5831,7 +5831,7 @@ static int sip_show_users(int fd, int argc, char *argv[])
regex_t regexbuf; regex_t regexbuf;
int havepattern = 0; int havepattern = 0;
#define FORMAT "%-15.15s %-15.15s %-15.15s %-15.15s %-5.5s%-5.5s\n" #define FORMAT "%-25.25s %-15.15s %-15.15s %-15.15s %-5.5s%-5.5s\n"
if (argc > 4) if (argc > 4)
return RESULT_SHOWUSAGE; return RESULT_SHOWUSAGE;
@@ -5875,8 +5875,8 @@ static int sip_show_peers(int fd, int argc, char *argv[])
regex_t regexbuf; regex_t regexbuf;
int havepattern = 0; int havepattern = 0;
#define FORMAT2 "%-15.15s %-15.15s %s %s %s %-15.15s %-8s %-10s\n" #define FORMAT2 "%-25.25s %-15.15s %-3.3s %-3.3s %-3.3s %-15.15s %-8s %-10s\n"
#define FORMAT "%-15.15s %-15.15s %s %s %s %-15.15s %-8d %-10s\n" #define FORMAT "%-25.25s %-15.15s %-3.3s %-3.3s %-3.3s %-15.15s %-8d %-10s\n"
char name[256] = ""; char name[256] = "";
char iabuf[INET_ADDRSTRLEN]; char iabuf[INET_ADDRSTRLEN];
@@ -6409,24 +6409,24 @@ static void receive_info(struct sip_pvt *p, struct sip_request *req)
event = 11; event = 11;
else else
event = atoi(buf); event = atoi(buf);
if (event < 10) { if (event < 10) {
resp = '0' + event; resp = '0' + event;
} else if (event < 11) { } else if (event < 11) {
resp = '*'; resp = '*';
} else if (event < 12) { } else if (event < 12) {
resp = '#'; resp = '#';
} else if (event < 16) { } else if (event < 16) {
resp = 'A' + (event - 12); resp = 'A' + (event - 12);
} }
/* Build DTMF frame and deliver to PBX for transmission to other call leg*/ /* Build DTMF frame and deliver to PBX for transmission to other call leg*/
memset(&f, 0, sizeof(f)); memset(&f, 0, sizeof(f));
f.frametype = AST_FRAME_DTMF; f.frametype = AST_FRAME_DTMF;
f.subclass = resp; f.subclass = resp;
f.offset = 0; f.offset = 0;
f.data = NULL; f.data = NULL;
f.datalen = 0; f.datalen = 0;
ast_queue_frame(p->owner, &f); ast_queue_frame(p->owner, &f);
} }
transmit_response(p, "200 OK", req); transmit_response(p, "200 OK", req);
return; return;
} else { } else {
@@ -9271,8 +9271,8 @@ static int reload_config(void)
if (sipsock < 0) { if (sipsock < 0) {
ast_log(LOG_WARNING, "Unable to create SIP socket: %s\n", strerror(errno)); ast_log(LOG_WARNING, "Unable to create SIP socket: %s\n", strerror(errno));
} else { } else {
/* Allow SIP clients on the same host to access us: */ /* Allow SIP clients on the same host to access us: */
const int reuseFlag = 1; const int reuseFlag = 1;
setsockopt(sipsock, SOL_SOCKET, SO_REUSEADDR, setsockopt(sipsock, SOL_SOCKET, SO_REUSEADDR,
(const char*)&reuseFlag, (const char*)&reuseFlag,
sizeof reuseFlag); sizeof reuseFlag);

2
include/asterisk/cdr.h
View File

@@ -41,7 +41,7 @@ struct ast_channel;
/*! Responsible for call detail data */ /*! Responsible for call detail data */
struct ast_cdr { struct ast_cdr {
/*! Caller*ID with text */ /*! Caller*ID with text */
char clid[AST_MAX_EXTENSION]; char clid[AST_MAX_EXTENSION];
/*! Caller*ID number */ /*! Caller*ID number */
char src[AST_MAX_EXTENSION]; char src[AST_MAX_EXTENSION];
/*! Destination extension */ /*! Destination extension */