diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2007-10-01 14:51:11 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2007-10-01 14:51:11 +0000 |
| commit | 086289983e574e1c396f57a1a2e238f899e543cd (patch) | |
| tree | e7bf00acc446001748899524541aa409233d9304 /main | |
| parent | 25be330cd045fdafabf1a42de3c4c2d5a4a546f5 (diff) | |
| download | php-git-086289983e574e1c396f57a1a2e238f899e543cd.tar.gz | |
Refactor code to make fixes for coverity issues #385 and #386 a bit more
obvious
Diffstat (limited to 'main')
| -rw-r--r-- | main/main.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/main/main.c b/main/main.c index b08fb65634..39ff698ffa 100644 --- a/main/main.c +++ b/main/main.c @@ -218,7 +218,11 @@ static PHP_INI_MH(OnUpdateTimeout) static int php_get_display_errors_mode(char *value, int value_length) { int mode; - + + if (!value) { + return PHP_DISPLAY_ERRORS_STDOUT; + } + if (value_length == 2 && !strcasecmp("on", value)) { mode = PHP_DISPLAY_ERRORS_STDOUT; } else if (value_length == 3 && !strcasecmp("yes", value)) { @@ -229,14 +233,13 @@ static int php_get_display_errors_mode(char *value, int value_length) mode = PHP_DISPLAY_ERRORS_STDERR; } else if (value_length == 6 && !strcasecmp(value, "stdout")) { mode = PHP_DISPLAY_ERRORS_STDOUT; - } else if (value) { + } else { mode = atoi(value); if (mode && mode != PHP_DISPLAY_ERRORS_STDOUT && mode != PHP_DISPLAY_ERRORS_STDERR) { mode = PHP_DISPLAY_ERRORS_STDOUT; } - } else { - mode = PHP_DISPLAY_ERRORS_STDOUT; } + return mode; } /* }}} */ |