diff options
| author | Sergey Kandaurov <pluknet@nginx.com> | 2016-03-31 02:34:04 +0300 |
|---|---|---|
| committer | Sergey Kandaurov <pluknet@nginx.com> | 2016-03-31 02:34:04 +0300 |
| commit | 60a6551e1f28337f7b358719fe46d4c91409dbf3 (patch) | |
| tree | 2bfaf1d39826f6970857d721fd8580e3d41853dc | |
| parent | 6a716c612378ea1673f38d3de9a467a47b5fe1ad (diff) | |
| download | nginx-60a6551e1f28337f7b358719fe46d4c91409dbf3.tar.gz nginx-60a6551e1f28337f7b358719fe46d4c91409dbf3.tar.bz2 | |
Fixed ngx_pid_t formatting in ngx_sprintf() and logging.
Diffstat (limited to '')
| -rw-r--r-- | src/os/unix/ngx_process.c | 2 | ||||
| -rw-r--r-- | src/os/win32/ngx_process.c | 6 | ||||
| -rw-r--r-- | src/os/win32/ngx_process_cycle.c | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/os/unix/ngx_process.c b/src/os/unix/ngx_process.c index 6f3f38556..ffc2a2a9c 100644 --- a/src/os/unix/ngx_process.c +++ b/src/os/unix/ngx_process.c @@ -622,7 +622,7 @@ ngx_os_signal_process(ngx_cycle_t *cycle, char *name, ngx_int_t pid) } ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, - "kill(%P, %d) failed", pid, sig->signo); + "kill(%P, %d) failed", (ngx_pid_t) pid, sig->signo); } } diff --git a/src/os/win32/ngx_process.c b/src/os/win32/ngx_process.c index 67c6b121a..02e6c1a2d 100644 --- a/src/os/win32/ngx_process.c +++ b/src/os/win32/ngx_process.c @@ -76,9 +76,9 @@ ngx_spawn_process(ngx_cycle_t *cycle, char *name, ngx_int_t respawn) ngx_processes[s].pid = pid; ngx_processes[s].name = name; - ngx_sprintf(ngx_processes[s].term_event, "ngx_%s_term_%ul%Z", name, pid); - ngx_sprintf(ngx_processes[s].quit_event, "ngx_%s_quit_%ul%Z", name, pid); - ngx_sprintf(ngx_processes[s].reopen_event, "ngx_%s_reopen_%ul%Z", + ngx_sprintf(ngx_processes[s].term_event, "ngx_%s_term_%P%Z", name, pid); + ngx_sprintf(ngx_processes[s].quit_event, "ngx_%s_quit_%P%Z", name, pid); + ngx_sprintf(ngx_processes[s].reopen_event, "ngx_%s_reopen_%P%Z", name, pid); events[0] = ngx_master_process_event; diff --git a/src/os/win32/ngx_process_cycle.c b/src/os/win32/ngx_process_cycle.c index 1f64551e7..699a5595d 100644 --- a/src/os/win32/ngx_process_cycle.c +++ b/src/os/win32/ngx_process_cycle.c @@ -581,7 +581,7 @@ ngx_worker_process_cycle(ngx_cycle_t *cycle, char *mevn) ngx_log_debug0(NGX_LOG_DEBUG_CORE, log, 0, "worker started"); - ngx_sprintf((u_char *) wtevn, "ngx_worker_term_%ul%Z", ngx_pid); + ngx_sprintf((u_char *) wtevn, "ngx_worker_term_%P%Z", ngx_pid); events[0] = CreateEvent(NULL, 1, 0, wtevn); if (events[0] == NULL) { ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, @@ -589,7 +589,7 @@ ngx_worker_process_cycle(ngx_cycle_t *cycle, char *mevn) goto failed; } - ngx_sprintf((u_char *) wqevn, "ngx_worker_quit_%ul%Z", ngx_pid); + ngx_sprintf((u_char *) wqevn, "ngx_worker_quit_%P%Z", ngx_pid); events[1] = CreateEvent(NULL, 1, 0, wqevn); if (events[1] == NULL) { ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, @@ -597,7 +597,7 @@ ngx_worker_process_cycle(ngx_cycle_t *cycle, char *mevn) goto failed; } - ngx_sprintf((u_char *) wroevn, "ngx_worker_reopen_%ul%Z", ngx_pid); + ngx_sprintf((u_char *) wroevn, "ngx_worker_reopen_%P%Z", ngx_pid); events[2] = CreateEvent(NULL, 1, 0, wroevn); if (events[2] == NULL) { ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, @@ -1007,7 +1007,7 @@ ngx_os_signal_process(ngx_cycle_t *cycle, char *sig, ngx_int_t pid) ngx_int_t rc; char evn[NGX_PROCESS_SYNC_NAME]; - ngx_sprintf((u_char *) evn, "Global\\ngx_%s_%ul%Z", sig, pid); + ngx_sprintf((u_char *) evn, "Global\\ngx_%s_%P%Z", sig, (ngx_pid_t) pid); ev = OpenEvent(EVENT_MODIFY_STATE, 0, evn); if (ev == NULL) { |