compile fixes

remotes/origin/master-1.0.x
Victor Julien 17 years ago
parent 28cad3429c
commit 4c79e6d5b6

@ -757,25 +757,25 @@ ConfNodeLookupChildValueTest(void)
TAILQ_INSERT_TAIL(&parent->head, child, next); TAILQ_INSERT_TAIL(&parent->head, child, next);
} }
value = ConfNodeLookupChildValue(parent, "one"); value = (char *)ConfNodeLookupChildValue(parent, "one");
if (value == NULL) if (value == NULL)
return 0; return 0;
if (strcmp(value, "one") != 0) if (strcmp(value, "one") != 0)
return 0; return 0;
value = ConfNodeLookupChildValue(parent, "two"); value = (char *)ConfNodeLookupChildValue(parent, "two");
if (value == NULL) if (value == NULL)
return 0; return 0;
if (strcmp(value, "two") != 0) if (strcmp(value, "two") != 0)
return 0; return 0;
value = ConfNodeLookupChildValue(parent, "three"); value = (char *)ConfNodeLookupChildValue(parent, "three");
if (value == NULL) if (value == NULL)
return 0; return 0;
if (strcmp(value, "three") != 0) if (strcmp(value, "three") != 0)
return 0; return 0;
value = ConfNodeLookupChildValue(parent, "four"); value = (char *)ConfNodeLookupChildValue(parent, "four");
if (value != NULL) if (value != NULL)
return 0; return 0;

@ -1013,14 +1013,14 @@ void SCLogLoadConfig(void)
/* Process each output. */ /* Process each output. */
ConfNode *output; ConfNode *output;
TAILQ_FOREACH(output, &outputs->head, next) { TAILQ_FOREACH(output, &outputs->head, next) {
ConfNode *param; //ConfNode *param;
char *interface = NULL; char *interface = NULL;
char *log_level = NULL; char *log_level = NULL;
char *facility = NULL; char *facility = NULL;
char *filename = NULL; //char *filename = NULL;
char *format = NULL; char *format = NULL;
interface = ConfNodeLookupChildValue(output, "interface"); interface = (char *)ConfNodeLookupChildValue(output, "interface");
if (interface == NULL) { if (interface == NULL) {
/* No interface in this item, ignore. */ /* No interface in this item, ignore. */
continue; continue;
@ -1032,10 +1032,10 @@ void SCLogLoadConfig(void)
} }
/* Any output may have a log-level set. */ /* Any output may have a log-level set. */
log_level = ConfNodeLookupChildValue(output, "log-level"); log_level = (char *)ConfNodeLookupChildValue(output, "log-level");
/* Any output may have a format set. */ /* Any output may have a format set. */
format = ConfNodeLookupChildValue(output, "format"); format = (char *)ConfNodeLookupChildValue(output, "format");
if (strcmp(interface, "console") == 0) { if (strcmp(interface, "console") == 0) {
/* No other lookups required for console logging. */ /* No other lookups required for console logging. */
@ -1043,7 +1043,7 @@ void SCLogLoadConfig(void)
log_level); log_level);
} }
else if (strcmp(interface, "syslog") == 0) { else if (strcmp(interface, "syslog") == 0) {
facility = ConfNodeLookupChildValue(output, "facility"); facility = (char *)ConfNodeLookupChildValue(output, "facility");
printf("Setting up syslog logging: log_level=%s, facility=%s.\n", printf("Setting up syslog logging: log_level=%s, facility=%s.\n",
log_level, facility); log_level, facility);
} }

Loading…
Cancel
Save