diff options
Diffstat (limited to 'src/os/unix/ngx_linux_init.c')
| -rw-r--r-- | src/os/unix/ngx_linux_init.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/os/unix/ngx_linux_init.c b/src/os/unix/ngx_linux_init.c index 9c1c84758..7f7be890a 100644 --- a/src/os/unix/ngx_linux_init.c +++ b/src/os/unix/ngx_linux_init.c @@ -28,7 +28,8 @@ ngx_os_io_t ngx_os_io = { }; -ngx_int_t ngx_os_init(ngx_log_t *log) +ngx_int_t +ngx_os_init(ngx_log_t *log) { int name[2]; size_t len; @@ -37,28 +38,29 @@ ngx_int_t ngx_os_init(ngx_log_t *log) name[0] = CTL_KERN; name[1] = KERN_OSTYPE; len = sizeof(ngx_linux_kern_ostype); - if (sysctl(name, sizeof(name), ngx_linux_kern_ostype, &len, NULL, 0) - == -1) { + + if (sysctl(name, 2, ngx_linux_kern_ostype, &len, NULL, 0) == -1) { ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, "sysctl(KERN_OSTYPE) failed"); return NGX_ERROR; } - name[0] = CTL_KERN; + /* name[0] = CTL_KERN; */ name[1] = KERN_OSRELEASE; len = sizeof(ngx_linux_kern_osrelease); - if (sysctl(name, sizeof(name), ngx_linux_kern_osrelease, &len, NULL, 0) - == -1) { + + if (sysctl(name, 2, ngx_linux_kern_osrelease, &len, NULL, 0) == -1) { ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, "sysctl(KERN_OSRELEASE) failed"); return NGX_ERROR; } - name[0] = CTL_KERN; + /* name[0] = CTL_KERN; */ name[1] = KERN_RTSIGMAX; len = sizeof(ngx_linux_rtsig_max); - if (sysctl(name, sizeof(name), &ngx_linux_rtsig_max, &len, NULL, 0) == -1) { + + if (sysctl(name, 2, &ngx_linux_rtsig_max, &len, NULL, 0) == -1) { err = ngx_errno; if (err != NGX_ENOTDIR) { @@ -78,7 +80,8 @@ ngx_int_t ngx_os_init(ngx_log_t *log) } -void ngx_os_status(ngx_log_t *log) +void +ngx_os_status(ngx_log_t *log) { ngx_log_error(NGX_LOG_INFO, log, 0, "OS: %s %s", ngx_linux_kern_ostype, ngx_linux_kern_osrelease); |