Commit d6f1ebb

author

Marc Stern

authored

Merge pull request #3265 from rainerjung/v2/move-id_log-to-msc_util

Move id_log() to msc_util to fix unit tests; it is declared on msc_ut...

2 parents 02ca247 + 1493763 commit d6f1ebbCopy full SHA for d6f1ebb

File tree

+10

-10

lines changed

+10

-10

lines changed

Lines changed: 0 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,16 +30,6 @@`
`30`	`30`	`APLOG_USE_MODULE(security2);`
`31`	`31`	`#endif`
`32`	`32`
`33`		`-// Returns the rule id if existing, otherwise the file name & line number`
`34`		`-const char* id_log(msre_rule* rule) {`
`35`		`- assert(rule != NULL);`
`36`		`- assert(rule->actionset != NULL);`
`37`		`- assert(rule->ruleset != NULL);`
`38`		`- const char* id = rule->actionset->id;`
`39`		`- if (!id \|\| id == NOT_SET_P \|\| !*id) id = apr_psprintf(rule->ruleset->mp, "%s (%d)", rule->filename, rule->line_num);`
`40`		`- return id;`
`41`		`-}`
`42`		`-`
`43`	`33`	`/* -- Directory context creation and initialisation -- */`
`44`	`34`
`45`	`35`	`/**`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2849,3 +2849,13 @@ char* get_username(apr_pool_t* mp) {`
`2849`	`2849`	`if (rc != APR_SUCCESS) return "apache";`
`2850`	`2850`	`return username;`
`2851`	`2851`	`}`
	`2852`	`+`
	`2853`	`+// Returns the rule id if existing, otherwise the file name & line number`
	`2854`	`+const char* id_log(msre_rule* rule) {`
	`2855`	`+ assert(rule != NULL);`
	`2856`	`+ assert(rule->actionset != NULL);`
	`2857`	`+ assert(rule->ruleset != NULL);`
	`2858`	`+ const char* id = rule->actionset->id;`
	`2859`	`+ if (!id \|\| id == NOT_SET_P \|\| !*id) id = apr_psprintf(rule->ruleset->mp, "%s (%d)", rule->filename, rule->line_num);`
	`2860`	`+ return id;`
	`2861`	`+}`

Comments

(0)