Merge 2.5.x changes into trunk.

This commit is contained in:
b1v1r
2009-05-16 10:42:32 +00:00
parent 9d26b16e23
commit a16eb9677c
10 changed files with 1683 additions and 1400 deletions

View File

@@ -450,7 +450,8 @@ static int test_action(action_data_t *data, char **errmsg)
/* Initialization */
static void init_msr() {
static void init_msr(void)
{
directory_config *dcfg = NULL;
request_rec *r = NULL;
r = (request_rec *)apr_pcalloc(g_mp, sizeof(request_rec));
@@ -533,7 +534,8 @@ static void init_msr() {
/**
* Usage text.
*/
static void usage() {
static void usage(void)
{
fprintf(stderr, "ModSecurity Unit Tester v%s\n", MODSEC_VERSION);
fprintf(stderr, " Usage: msc_test [options]\n");
fprintf(stderr, "\n");