Fix ParseSizeString return code and a compiler warning.

remotes/origin/master-1.2.x
Victor Julien 14 years ago
parent 4b8ebb5c53
commit 678213c9f4

@ -1168,7 +1168,7 @@ int main(int argc, char **argv)
}
}
SCLogDebug("Default packet size set to %"PRIiMAX, default_packet_size);
SCLogDebug("Default packet size set to %"PRIu32, default_packet_size);
#ifdef NFQ
if (run_mode == RUNMODE_NFQ)

@ -34,16 +34,13 @@ static int ParseSizeString(const char *size, long double *res)
pcre *parse_regex;
pcre_extra *parse_regex_study;
const char *eb;
int eo;
int opts = 0;
#define MAX_SUBSTRINGS 30
int pcre_exec_ret;
int r;
int ov[MAX_SUBSTRINGS];
int retval = 0;
*res = 0;
@ -123,8 +120,8 @@ static int ParseSizeString(const char *size, long double *res)
}
return 0;
error:
return -1;
error:
return retval;
}
int ParseSizeStringU8(const char *size, uint8_t *res)

Loading…
Cancel
Save