fixed size array cannot be null

diff --git a/sapi/fpm/fpm/fpm_log.c b/sapi/fpm/fpm/fpm_log.c
index 6b014b5005a154cd9fd3c6abe91d89159a36a551..303acb218654b8a0293e3c052a90670cd4eb0793 100644 (file)
--- a/sapi/fpm/fpm/fpm_log.c
+++ b/sapi/fpm/fpm/fpm_log.c
@@ -237,7 +237,7 @@ int fpm_log_write(char *log_format TSRMLS_DC) /* {{{ */
 
                                case 'f': /* script */
                                        if (!test) {
-                                               len2 = snprintf(b, FPM_LOG_BUFFER - len, "%s",  proc.script_filename && *proc.script_filename ? proc.script_filename : "-");
+                                               len2 = snprintf(b, FPM_LOG_BUFFER - len, "%s",  *proc.script_filename ? proc.script_filename : "-");
                                        }
                                        break;
 
@@ -249,7 +249,7 @@ int fpm_log_write(char *log_format TSRMLS_DC) /* {{{ */
 
                                case 'm': /* method */
                                        if (!test) {
-                                               len2 = snprintf(b, FPM_LOG_BUFFER - len, "%s", proc.request_method && *proc.request_method ? proc.request_method : "-");
+                                               len2 = snprintf(b, FPM_LOG_BUFFER - len, "%s", *proc.request_method ? proc.request_method : "-");
                                        }
                                        break;
 
@@ -347,19 +347,19 @@ int fpm_log_write(char *log_format TSRMLS_DC) /* {{{ */
 
                                case 'q': /* query_string */
                                        if (!test) {
-                                               len2 = snprintf(b, FPM_LOG_BUFFER - len, "%s", proc.query_string ? proc.query_string : "");
+                                               len2 = snprintf(b, FPM_LOG_BUFFER - len, "%s", proc.query_string);
                                        }
                                        break;
 
                                case 'Q': /* '?' */
                                        if (!test) {
-                                               len2 = snprintf(b, FPM_LOG_BUFFER - len, "%s", proc.query_string && *proc.query_string  ? "?" : "");
+                                               len2 = snprintf(b, FPM_LOG_BUFFER - len, "%s", *proc.query_string  ? "?" : "");
                                        }
                                        break;
 
                                case 'r': /* request URI */
                                        if (!test) {
-                                               len2 = snprintf(b, FPM_LOG_BUFFER - len, "%s", proc.request_uri ? proc.request_uri : "-");
+                                               len2 = snprintf(b, FPM_LOG_BUFFER - len, "%s", proc.request_uri);
                                        }
                                        break;
 
@@ -397,7 +397,7 @@ int fpm_log_write(char *log_format TSRMLS_DC) /* {{{ */
 
                                case 'u': /* remote user */
                                        if (!test) {
-                                               len2 = snprintf(b, FPM_LOG_BUFFER - len, "%s", proc.auth_user ? proc.auth_user : "-");
+                                               len2 = snprintf(b, FPM_LOG_BUFFER - len, "%s", proc.auth_user);
                                        }
                                        break;