kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-02 11:58:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

bring over all the fixes for the warnings found by gcc 4.3.x from the 1.4 branch, and add the ones needed for all the new code here too

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@153616 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2008-11-02 18:52:13 +00:00
parent 1e6864dd9d
commit bd4eb070f3
50 changed files with 965 additions and 487 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
main/asterisk.c
View File

@@ -1218,8 +1218,11 @@ static void hup_handler(int num)
if (restartnow)
execvp(_argv[0], _argv);
sig_flags.need_reload = 1;
if (sig_alert_pipe[1] != -1)
write(sig_alert_pipe[1], &a, sizeof(a));
if (sig_alert_pipe[1] != -1) {
if (write(sig_alert_pipe[1], &a, sizeof(a)) < 0) {
fprintf(stderr, "hup_handler: write() failed: %s\n", strerror(errno));
}
}
signal(num, hup_handler);
}
@@ -1434,8 +1437,11 @@ static void __quit_handler(int num)
{
int a = 0;
sig_flags.need_quit = 1;
if (sig_alert_pipe[1] != -1)
write(sig_alert_pipe[1], &a, sizeof(a));
if (sig_alert_pipe[1] != -1) {
if (write(sig_alert_pipe[1], &a, sizeof(a)) < 0) {
fprintf(stderr, "hup_handler: write() failed: %s\n", strerror(errno));
}
}
/* There is no need to restore the signal handler here, since the app
* is going to exit */
}
@@ -1814,7 +1820,7 @@ static char *show_warranty(struct ast_cli_entry *e, int cmd, struct ast_cli_args
return NULL;
}
ast_cli(a->fd, warranty_lines);
ast_cli(a->fd, "%s", warranty_lines);
return CLI_SUCCESS;
}
@@ -1851,7 +1857,7 @@ static char *show_license(struct ast_cli_entry *e, int cmd, struct ast_cli_args
return NULL;
}
ast_cli(a->fd, license_lines);
ast_cli(a->fd, "%s", license_lines);
return CLI_SUCCESS;
}
@@ -1971,9 +1977,12 @@ static int ast_el_read_char(EditLine *editline, char *cp)
}
/* Write over the CLI prompt */
if (!ast_opt_exec && !lastpos)
write(STDOUT_FILENO, "\r", 1);
write(STDOUT_FILENO, buf, res);
if (!ast_opt_exec && !lastpos) {
if (write(STDOUT_FILENO, "\r", 1) < 0) {
}
}
if (write(STDOUT_FILENO, buf, res) < 0) {
}
if ((res < EL_BUF_SIZE - 1) && ((buf[res-1] == '\n') || (buf[res-2] == '\n'))) {
*cp = CC_REFRESH;
return(1);
@@ -2416,7 +2425,7 @@ static int ast_el_read_history(char *filename)
return ret;
}
static void ast_remotecontrol(char * data)
static void ast_remotecontrol(char *data)
{
char buf[80];
int res;
@@ -2430,12 +2439,17 @@ static void ast_remotecontrol(char * data)
char *ebuf;
int num = 0;
read(ast_consock, buf, sizeof(buf));
if (read(ast_consock, buf, sizeof(buf)) < 0) {
ast_log(LOG_ERROR, "read() failed: %s\n", strerror(errno));
return;
}
if (data) {
char prefix[] = "cli quit after ";
char *tmp = alloca(strlen(data) + strlen(prefix) + 1);
sprintf(tmp, "%s%s", prefix, data);
write(ast_consock, tmp, strlen(tmp) + 1);
if (write(ast_consock, tmp, strlen(tmp) + 1) < 0) {
ast_log(LOG_ERROR, "write() failed: %s\n", strerror(errno));
}
}
stringp = buf;
hostname = strsep(&stringp, "/");
@@ -2495,7 +2509,9 @@ static void ast_remotecontrol(char * data)
/* Skip verbose lines */
if (*curline != 127) {
not_written = 0;
write(STDOUT_FILENO, curline, nextline - curline);
if (write(STDOUT_FILENO, curline, nextline - curline) < 0) {
ast_log(LOG_WARNING, "write() failed: %s\n", strerror(errno));
}
}
curline = nextline;
} while (!ast_strlen_zero(curline));
@@ -2825,7 +2841,8 @@ static void *monitor_sig_flags(void *unused)
sig_flags.need_quit = 0;
quit_handler(0, 0, 1, 0);
}
read(sig_alert_pipe[0], &a, sizeof(a));
if (read(sig_alert_pipe[0], &a, sizeof(a)) != sizeof(a)) {
}
}
return NULL;
@@ -3265,7 +3282,9 @@ int main(int argc, char *argv[])
#if HAVE_WORKING_FORK
if (ast_opt_always_fork || !ast_opt_no_fork) {
#ifndef HAVE_SBIN_LAUNCHD
daemon(1, 0);
if (daemon(1, 0) < 0) {
ast_log(LOG_ERROR, "daemon() failed: %s\n", strerror(errno));
}
ast_mainpid = getpid();
/* Blindly re-write pid file since we are forking */
unlink(ast_config_AST_PID);