Commit b0c2cdd6 authored by Salvatore Sanfilippo's avatar Salvatore Sanfilippo
Browse files

Merge pull request #1167 from badboy/patch-1

Initialize char* to NULL to remove compiler warning
parents 519c9e11 5ac7ca9c
...@@ -1332,7 +1332,7 @@ void rewriteConfigOctalOption(struct rewriteConfigState *state, char *option, in ...@@ -1332,7 +1332,7 @@ void rewriteConfigOctalOption(struct rewriteConfigState *state, char *option, in
* specified. See how the function is used for more information. */ * specified. See how the function is used for more information. */
void rewriteConfigEnumOption(struct rewriteConfigState *state, char *option, int value, ...) { void rewriteConfigEnumOption(struct rewriteConfigState *state, char *option, int value, ...) {
va_list ap; va_list ap;
char *enum_name, *matching_name; char *enum_name, *matching_name = NULL;
int enum_val, def_val, force; int enum_val, def_val, force;
sds line; sds line;
...@@ -1357,7 +1357,7 @@ void rewriteConfigEnumOption(struct rewriteConfigState *state, char *option, int ...@@ -1357,7 +1357,7 @@ void rewriteConfigEnumOption(struct rewriteConfigState *state, char *option, int
void rewriteConfigSyslogfacilityOption(struct rewriteConfigState *state) { void rewriteConfigSyslogfacilityOption(struct rewriteConfigState *state) {
int value = server.syslog_facility, j; int value = server.syslog_facility, j;
int force = value != LOG_LOCAL0; int force = value != LOG_LOCAL0;
char *name, *option = "syslog-facility"; char *name = NULL, *option = "syslog-facility";
sds line; sds line;
for (j = 0; validSyslogFacilities[j].name; j++) { for (j = 0; validSyslogFacilities[j].name; j++) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment