nginx: src/core/nginx.c comparison

r2303 merge: compatibility with glibc 2.3, warn_unused_result attribute for write()

comparison

equal deleted inserted replaced

-:be8c6159590b
+:0ebecd0c3410
 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;
 ngx_core_conf_t  *ccf;
 if (ngx_getopt(&init_cycle, argc, ngx_argv) != NGX_OK) {
 return 1;
 }
 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,
+p = "built by " NGX_COMPILER CRLF;
-sizeof("built by " NGX_COMPILER CRLF) - 1);
+n = sizeof("built by " NGX_COMPILER CRLF) - 1;
-#endif
+if (ngx_write_fd(ngx_stderr_fileno, p, n) != n) {
-#ifndef __WATCOMC__
+return 1;
+}
-/* OpenWatcomC could not build the long NGX_CONFIGURE string */
+#endif
-ngx_write_fd(ngx_stderr_fileno,
+p = "configure arguments: " NGX_CONFIGURE CRLF;
-"configure arguments: " NGX_CONFIGURE CRLF,
+n = sizeof("configure arguments :" NGX_CONFIGURE CRLF) - 1;
-sizeof("configure arguments :" NGX_CONFIGURE CRLF) - 1);
-#endif
+if (ngx_write_fd(ngx_stderr_fileno, p, n) != n) {
+return 1;
+}
 }
 if (!ngx_test_config) {
 return 0;
 }

Mercurial > hg > nginx