diff options
| -rw-r--r-- | asterisk.c | 12 | ||||
| -rw-r--r-- | include/asterisk/options.h | 2 | ||||
| -rw-r--r-- | logger.c | 2 | ||||
| -rw-r--r-- | pbx/pbx_spool.c | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/asterisk.c b/asterisk.c index 418ce491b..3704a9f31 100644 --- a/asterisk.c +++ b/asterisk.c @@ -171,7 +171,7 @@ char debug_filename[AST_FILENAME_MAX] = ""; static int ast_socket = -1; /*!< UNIX Socket for allowing remote control */ static int ast_consock = -1; /*!< UNIX Socket for controlling another asterisk */ -int ast_mainpid; +pid_t ast_mainpid; struct console { int fd; /*!< File descriptor */ int p[2]; /*!< Pipe */ @@ -722,7 +722,7 @@ static void *netconsole(void *vconsole) if (gethostname(hostname, sizeof(hostname)-1)) ast_copy_string(hostname, "<Unknown>", sizeof(hostname)); - snprintf(tmp, sizeof(tmp), "%s/%d/%s\n", hostname, ast_mainpid, ASTERISK_VERSION); + snprintf(tmp, sizeof(tmp), "%s/%ld/%s\n", hostname, (long)ast_mainpid, ASTERISK_VERSION); fdprint(con->fd, tmp); for(;;) { fds[0].fd = con->fd; @@ -2514,22 +2514,22 @@ int main(int argc, char *argv[]) unlink(ast_config_AST_PID); f = fopen(ast_config_AST_PID, "w"); if (f) { - fprintf(f, "%d\n", (int)getpid()); + fprintf(f, "%ld\n", (long)getpid()); fclose(f); } else ast_log(LOG_WARNING, "Unable to open pid file '%s': %s\n", ast_config_AST_PID, strerror(errno)); if (ast_opt_always_fork || !ast_opt_no_fork) { daemon(0, 0); + ast_mainpid = getpid(); /* Blindly re-write pid file since we are forking */ unlink(ast_config_AST_PID); f = fopen(ast_config_AST_PID, "w"); if (f) { - fprintf(f, "%d\n", (int)getpid()); + fprintf(f, "%ld\n", (long)ast_mainpid); fclose(f); } else ast_log(LOG_WARNING, "Unable to open pid file '%s': %s\n", ast_config_AST_PID, strerror(errno)); - ast_mainpid = getpid(); } /* Test recursive mutex locking. */ @@ -2656,7 +2656,7 @@ int main(int argc, char *argv[]) /* Register our quit function */ char title[256]; set_icon("Asterisk"); - snprintf(title, sizeof(title), "Asterisk Console on '%s' (pid %d)", hostname, ast_mainpid); + snprintf(title, sizeof(title), "Asterisk Console on '%s' (pid %ld)", hostname, (long)ast_mainpid); set_title(title); for (;;) { diff --git a/include/asterisk/options.h b/include/asterisk/options.h index 04e7990b8..bc4c10905 100644 --- a/include/asterisk/options.h +++ b/include/asterisk/options.h @@ -114,7 +114,7 @@ extern char defaultlanguage[]; extern time_t ast_startuptime; extern time_t ast_lastreloadtime; -extern int ast_mainpid; +extern pid_t ast_mainpid; extern char record_cache_dir[AST_CACHE_DIR_LEN]; extern char debug_filename[AST_FILENAME_MAX]; @@ -722,7 +722,7 @@ void ast_log(int level, const char *file, int line, const char *function, const if (logfiles.event_log && level == __LOG_EVENT) { va_start(ap, fmt); - fprintf(eventlog, "%s asterisk[%d]: ", date, getpid()); + fprintf(eventlog, "%s asterisk[%ld]: ", date, (long)getpid()); vfprintf(eventlog, fmt, ap); fflush(eventlog); diff --git a/pbx/pbx_spool.c b/pbx/pbx_spool.c index e7136aa44..132508a65 100644 --- a/pbx/pbx_spool.c +++ b/pbx/pbx_spool.c @@ -66,7 +66,7 @@ struct outgoing { /* How long to wait for an answer */ int waittime; /* PID which is currently calling */ - int callingpid; + long callingpid; /* What to connect to outgoing */ char tech[256]; @@ -193,7 +193,7 @@ static int apply_outgoing(struct outgoing *o, char *fn, FILE *f) } else if (!strcasecmp(buf, "retry")) { o->retries++; } else if (!strcasecmp(buf, "startretry")) { - if (sscanf(c, "%d", &o->callingpid) != 1) { + if (sscanf(c, "%ld", &o->callingpid) != 1) { ast_log(LOG_WARNING, "Unable to retrieve calling PID!\n"); o->callingpid = 0; } |