aboutsummaryrefslogtreecommitdiff
path: root/src/core/nginx.c
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2008-11-11 16:17:45 +0000
committerIgor Sysoev <igor@sysoev.ru>2008-11-11 16:17:45 +0000
commitf2884e194ab1bfe7bec979d04b21dc5f5e4a3628 (patch)
tree8f3b8c6e72e2a63ebfa6c49fec1b3d39580995f2 /src/core/nginx.c
parentead8091746f136d7563824c7468d570481fb4e3c (diff)
downloadnginx-f2884e194ab1bfe7bec979d04b21dc5f5e4a3628.tar.gz
nginx-f2884e194ab1bfe7bec979d04b21dc5f5e4a3628.zip
compatibility with glibc 2.3, warn_unused_result attribute for write()
Diffstat (limited to 'src/core/nginx.c')
-rw-r--r--src/core/nginx.c31
1 files changed, 20 insertions, 11 deletions
diff --git a/src/core/nginx.c b/src/core/nginx.c
index c1c6c0c25..06721269b 100644
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -191,6 +191,8 @@ static char **ngx_os_environ;
int ngx_cdecl
main(int argc, char *const *argv)
{
+ char *p;
+ ssize_t n;
ngx_int_t i;
ngx_log_t *log;
ngx_cycle_t *cycle, init_cycle;
@@ -240,23 +242,30 @@ main(int argc, char *const *argv)
}
if (ngx_show_version) {
- ngx_write_fd(ngx_stderr_fileno, "nginx version: " NGINX_VER CRLF,
- sizeof("nginx version: " NGINX_VER CRLF) - 1);
+
+ p = "nginx version: " NGINX_VER CRLF;
+ n = sizeof("nginx version: " NGINX_VER CRLF) - 1;
+
+ if (ngx_write_fd(ngx_stderr_fileno, p, n) != n) {
+ return 1;
+ }
if (ngx_show_configure) {
#ifdef NGX_COMPILER
- ngx_write_fd(ngx_stderr_fileno, "built by " NGX_COMPILER CRLF,
- sizeof("built by " NGX_COMPILER CRLF) - 1);
-#endif
+ p = "built by " NGX_COMPILER CRLF;
+ n = sizeof("built by " NGX_COMPILER CRLF) - 1;
-#ifndef __WATCOMC__
+ if (ngx_write_fd(ngx_stderr_fileno, p, n) != n) {
+ return 1;
+ }
+#endif
- /* OpenWatcomC could not build the long NGX_CONFIGURE string */
+ p = "configure arguments: " NGX_CONFIGURE CRLF;
+ n = sizeof("configure arguments :" NGX_CONFIGURE CRLF) - 1;
- ngx_write_fd(ngx_stderr_fileno,
- "configure arguments: " NGX_CONFIGURE CRLF,
- sizeof("configure arguments :" NGX_CONFIGURE CRLF) - 1);
-#endif
+ if (ngx_write_fd(ngx_stderr_fileno, p, n) != n) {
+ return 1;
+ }
}
if (!ngx_test_config) {