core: use defines for types of preprocessor defs

src/core/cfg.lex

@@ -1329,15 +1329,15 @@ IMPORTFILE      "import_file"
 
 <INITIAL,CFGPRINTMODE>{PREP_START}{DEFINE}{EAT_ABLE}+	{	count();
 											ksr_cfg_print_part(yytext);
-											pp_define_set_type(0);
+											pp_define_set_type(KSR_PPDEF_DEFINE);
 											state = DEFINE_S; BEGIN(DEFINE_ID); }
 <INITIAL,CFGPRINTMODE>{PREP_START}{TRYDEF}{EAT_ABLE}+	{	count();
 											ksr_cfg_print_part(yytext);
-											pp_define_set_type(1);
+											pp_define_set_type(KSR_PPDEF_TRYDEF);
 											state = DEFINE_S; BEGIN(DEFINE_ID); }
 <INITIAL,CFGPRINTMODE>{PREP_START}{REDEF}{EAT_ABLE}+	{	count();
 											ksr_cfg_print_part(yytext);
-											pp_define_set_type(2);
+											pp_define_set_type(KSR_PPDEF_REDEF);
 											state = DEFINE_S; BEGIN(DEFINE_ID); }
 <DEFINE_ID>{ID}{MINUS}          {	count();
 									ksr_cfg_print_part(yytext);
@@ -1665,7 +1665,7 @@ static void ksr_cfg_print_define_module(char *modpath, int modpathlen)
 	}
 	memcpy(defmod, "MOD_", 4);
 	memcpy(defmod+4, modname.s, modname.len);
-	pp_define_set_type(0);
+	pp_define_set_type(KSR_PPDEF_DEFINE);
 	if(pp_define(modname.len + 4, defmod)<0) {
 		printf("\n# ***** ERROR: unable to set cfg define for module: %s\n",
 				modpath);
@@ -2067,11 +2067,11 @@ int pp_define(int len, const char *text)
 	pp_define_index = -1;
 	ppos = pp_lookup(len, text);
 	if(ppos >= 0) {
-		if(pp_define_type==1) {
+		if(pp_define_type==KSR_PPDEF_TRYDEF) {
 			LM_DBG("ignoring - already defined: %.*s\n", len, text);
 			pp_define_index = -2;
 			return 0;
-		} else if(pp_define_type==2) {
+		} else if(pp_define_type==KSR_PPDEF_REDEF) {
 			LM_DBG("redefining: %.*s\n", len, text);
 			pp_define_index = ppos;
 			if(pp_defines[ppos].value.s != NULL) {
@@ -2187,7 +2187,7 @@ int pp_define_env(const char *text, int len, int qmode, int vmode)
 	}
 	defvalue.len = strlen(defvalue.s);
 
-	pp_define_set_type(0);
+	pp_define_set_type(KSR_PPDEF_DEFINE);
 	if(pp_define(defname.len, defname.s)<0) {
 		LM_ERR("cannot set define name [%s]\n", (char*)text);
 		return -1;

src/core/ppcfg.c

@@ -169,7 +169,7 @@ found_regexp:
 found_repl:
 	defvalue.len = p - defvalue.s;
 
-	pp_define_set_type(0);
+	pp_define_set_type(KSR_PPDEF_DEFINE);
 	if(pp_define(defname.len, defname.s)<0) {
 		LM_ERR("cannot set define name\n");
 		goto error;
@@ -305,7 +305,7 @@ void pp_define_core(void)
 		LM_ERR("failed to build define token\n");
 		return;
 	}
-	pp_define_set_type(0);
+	pp_define_set_type(KSR_PPDEF_DEFINE);
 	if(pp_define(strlen(defval), defval)<0) {
 		LM_ERR("unable to set cfg define: %s\n", defval);
 		return;
@@ -317,7 +317,7 @@ void pp_define_core(void)
 		LM_ERR("failed to build define token\n");
 		return;
 	}
-	pp_define_set_type(0);
+	pp_define_set_type(KSR_PPDEF_DEFINE);
 	if(pp_define(strlen(defval), defval)<0) {
 		LM_ERR("unable to set cfg define: %s\n", defval);
 		return;
@@ -329,14 +329,14 @@ void pp_define_core(void)
 		LM_ERR("failed to build define token\n");
 		return;
 	}
-	pp_define_set_type(0);
+	pp_define_set_type(KSR_PPDEF_DEFINE);
 	if(pp_define(strlen(defval), defval)<0) {
 		LM_ERR("unable to set cfg define: %s\n", defval);
 		return;
 	}
 
 	strcpy(p, "_VERSION");
-	pp_define_set_type(0);
+	pp_define_set_type(KSR_PPDEF_DEFINE);
 	if(pp_define(strlen(defval), defval)<0) {
 		LM_ERR("unable to set cfg define: %s\n", defval);
 		return;

src/core/ppcfg.h

@@ -27,9 +27,14 @@
 
 #define KSR_PPDEF_NORMAL (0)     /* define normal value */
 #define KSR_PPDEF_QUOTED (1<<0)  /* define quoted value */
+
 #define KSR_PPDEF_VALREQ (0)     /* define with value required (defenv) */
 #define KSR_PPDEF_VALTRY (1<<0)  /* define only if value exists (trydefenv) */
 
+#define KSR_PPDEF_DEFINE  0
+#define KSR_PPDEF_TRYDEF  1
+#define KSR_PPDEF_REDEF   2
+
 typedef struct ksr_ppdefine {
 	str name;
 	str value;

src/core/sr_module.c

@@ -321,7 +321,7 @@ static int register_module(module_exports_t* e, char* path, void* handle)
 	}
 	strcpy(defmod, "MOD_");
 	strcat(defmod, mod->exports.name);
-	pp_define_set_type(0);
+	pp_define_set_type(KSR_PPDEF_DEFINE);
 	if(pp_define(strlen(defmod), defmod)<0) {
 		LM_ERR("unable to set cfg define for module: %s\n",
 				mod->exports.name);

src/main.c

@@ -2286,7 +2286,7 @@ int main(int argc, char** argv)
 					} else {
 						tmp_len = strlen(optarg);
 					}
-					pp_define_set_type(0);
+					pp_define_set_type(KSR_PPDEF_DEFINE);
 					if(pp_define(tmp_len, optarg)<0) {
 						fprintf(stderr, "error at define param: -A %s\n",
 								optarg);