prelude-lml/master: GCC extra warnings fixes
[email protected] Mon, 8 Feb 2010 11:24:48 +0100 (CET)
| Newsgroups | gmane.comp.security.ids.prelude.cvs |
|---|---|
| Message-ID | <[email protected]> |
commit 76bf2f7fce0f4511a3a8c8a1c7e04d24055b02cc Author: Yoann Vandoorselaere <[email protected]> Date: Sat Feb 6 10:07:04 2010 +0100 GCC extra warnings fixes ======================================== plugins/pcre/pcre-mod.c | 11 ++++++----- plugins/pcre/rule-regex.c | 10 ++++------ plugins/pcre/value-container.c | 3 ++- src/lml-options.c | 4 ++-- src/log-source.c | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) ======================================== diff --git a/plugins/pcre/pcre-mod.c b/plugins/pcre/pcre-mod.c index f8bceb1..c70fa62 100644 --- a/plugins/pcre/pcre-mod.c +++ b/plugins/pcre/pcre-mod.c @@ -220,7 +220,7 @@ static int parse_rule_optregex(pcre_plugin_t *plugin, pcre_rule_t *rule, const c -static pcre_rule_container_t *search_rule(prelude_list_t *head, int id) +static pcre_rule_container_t *search_rule(prelude_list_t *head, unsigned int id) { prelude_list_t *tmp; pcre_rule_container_t *cur; @@ -241,7 +241,7 @@ static pcre_rule_container_t *search_rule(prelude_list_t *head, int id) -static int add_goto_single(pcre_plugin_t *plugin, pcre_rule_t *rule, int id, prelude_bool_t optional) +static int add_goto_single(pcre_plugin_t *plugin, pcre_rule_t *rule, unsigned int id, prelude_bool_t optional) { pcre_rule_container_t *new, *cur; @@ -269,9 +269,10 @@ static int add_goto_single(pcre_plugin_t *plugin, pcre_rule_t *rule, int id, pre static int add_goto(pcre_plugin_t *plugin, pcre_rule_t *rule, const char *idstr, prelude_bool_t optional) { - int ret, i, idmin = 0, idmax = 0; + int ret; + unsigned int i, idmin = 0, idmax = 0; - ret = sscanf(idstr, "%d-%d", &idmin, &idmax); + ret = sscanf(idstr, "%u-%u", &idmin, &idmax); if ( ret < 1 ) { prelude_log(PRELUDE_LOG_WARN, "could not parse goto value '%s'.\n", idstr); return -1; @@ -571,7 +572,7 @@ static int parse_rule_keyword(pcre_plugin_t *plugin, pcre_rule_t *rule, const char *filename, int line, const char *keyword, const char *value) { - int i; + unsigned int i; struct { const char *keyword; int (*func)(pcre_plugin_t *plugin, pcre_rule_t *rule, const char *value); diff --git a/plugins/pcre/rule-regex.c b/plugins/pcre/rule-regex.c index 72141f6..9ed234a 100644 --- a/plugins/pcre/rule-regex.c +++ b/plugins/pcre/rule-regex.c @@ -326,8 +326,7 @@ int pcre_state_clone(pcre_state_t *state, pcre_state_t **new) } -static int match_rule_single(pcre_plugin_t *plugin, pcre_rule_t *rule, pcre_state_t **state, - const lml_log_source_t *ls, const lml_log_entry_t *log_entry) +static int match_rule_single(pcre_plugin_t *plugin, pcre_rule_t *rule, pcre_state_t **state, const lml_log_entry_t *log_entry) { int ret; prelude_list_t *tmp; @@ -375,8 +374,7 @@ static int match_rule_single(pcre_plugin_t *plugin, pcre_rule_t *rule, pcre_stat } -static void create_context_if_needed(pcre_plugin_t *plugin, pcre_rule_t *rule, pcre_state_t *state, - const lml_log_source_t *ls, lml_log_entry_t *log_entry) +static void create_context_if_needed(pcre_plugin_t *plugin, pcre_rule_t *rule, pcre_state_t *state, lml_log_entry_t *log_entry) { prelude_list_t *tmp; prelude_string_t *str; @@ -438,7 +436,7 @@ static int match_rule_list(pcre_plugin_t *plugin, pcre_rule_t *rule = rc->rule; pcre_rule_container_t *child; - ret = match_rule_single(plugin, rule, &state, ls, log_entry); + ret = match_rule_single(plugin, rule, &state, log_entry); if ( ret < 0 ) return -1; @@ -465,7 +463,7 @@ static int match_rule_list(pcre_plugin_t *plugin, } pcre_state_add_rule_infos(state, rule, ls, log_entry); - create_context_if_needed(plugin, rule, state, ls, log_entry); + create_context_if_needed(plugin, rule, state, log_entry); if ( state->idmef ) { *match_flags |= PCRE_MATCH_FLAGS_ALERT; diff --git a/plugins/pcre/value-container.c b/plugins/pcre/value-container.c index 07b04d8..8094079 100644 --- a/plugins/pcre/value-container.c +++ b/plugins/pcre/value-container.c @@ -103,8 +103,9 @@ static int add_fixed_object_value(value_container_t *vcont, prelude_string_t *bu static int parse_value(value_container_t *vcont, const char *line) { - int i, ret; + int ret; char num[10]; + unsigned int i; const char *str; prelude_string_t *strbuf; diff --git a/src/lml-options.c b/src/lml-options.c index ca8cde2..a4063bf 100644 --- a/src/lml-options.c +++ b/src/lml-options.c @@ -143,7 +143,7 @@ static char *const2char(const char *val) static int set_metadata_flags(prelude_option_t *opt, const char *arg, prelude_string_t *err, void *context) { - int i; + unsigned int i; file_server_metadata_flags_t flags = 0; char *name, *value = const2char(arg); struct { @@ -322,7 +322,7 @@ static int glob_errfunc_cb(const char *epath, int eerrno) static prelude_bool_t isglob(const char *pattern) { - int i; + unsigned int i; const char *ptr; char chlist[] = { '*', '?', '[', '~' }; diff --git a/src/log-source.c b/src/log-source.c index dc8cf84..9587472 100644 --- a/src/log-source.c +++ b/src/log-source.c @@ -126,7 +126,7 @@ static lml_log_format_t *lml_log_format_ref(lml_log_format_t *lf) } -static inline int _fallback_preprocess_input(lml_log_source_t *source, const char *in, size_t inlen, char **out, size_t *outlen) +static inline int _fallback_preprocess_input(const char *in, size_t inlen, char **out, size_t *outlen) { if ( inlen + 1 < inlen ) return -1; @@ -150,7 +150,7 @@ int lml_log_source_preprocess_input(lml_log_source_t *source, const char *in, si ret = lml_charset_convert(source->charset, in, inlen, out, outlen); if ( ret < 0 ) - ret = _fallback_preprocess_input(source, in, inlen, out, outlen); + ret = _fallback_preprocess_input(in, inlen, out, outlen); return ret; } _______________________________________________ Prelude-cvslog site list [email protected] http://lists.prelude-technologies.com/mailman/listinfo/prelude-cvslog