core: cfg group vars - updated log macros

src/core/cfg/cfg.c

@@ -49,13 +49,13 @@ int cfg_declare(char *group_name, cfg_def_t *def, void *values, int def_size,
 
 	mapping = (cfg_mapping_t *)pkg_malloc(sizeof(cfg_mapping_t)*num);
 	if (!mapping) {
-		LOG(L_ERR, "ERROR: register_cfg_def(): not enough memory\n");
+		LM_ERR("not enough memory\n");
 		goto error;
 	}
 	memset(mapping, 0, sizeof(cfg_mapping_t)*num);
 	types=0;
 	/* calculate the size of the memory block that has to
-	be allocated for the cfg variables, and set the content of the 
+	be allocated for the cfg variables, and set the content of the
 	cfg_mapping array the same time */
 	for (i=0, size=0; i<num; i++) {
 		mapping[i].def = &(def[i]);
@@ -87,7 +87,7 @@ int cfg_declare(char *group_name, cfg_def_t *def, void *values, int def_size,
 			break;
 
 		default:
-			LOG(L_ERR, "ERROR: register_cfg_def(): %s.%s: unsupported variable type\n",
+			LM_ERR("%s.%s: unsupported variable type\n",
 					group_name, def[i].name);
 			goto error;
 		}
@@ -98,7 +98,7 @@ int cfg_declare(char *group_name, cfg_def_t *def, void *values, int def_size,
 		} else {
 			if ((CFG_INPUT_MASK(def[i].type) != CFG_VAR_MASK(def[i].type) << CFG_INPUT_SHIFT)
 			&& (def[i].on_change_cb == 0)) {
-				LOG(L_ERR, "ERROR: register_cfg_def(): %s.%s: variable and input types are "
+				LM_ERR("%s.%s: variable and input types are "
 					"different, but no callback is defined for conversion\n",
 					group_name, def[i].name);
 				goto error;
@@ -106,20 +106,20 @@ int cfg_declare(char *group_name, cfg_def_t *def, void *values, int def_size,
 		}
 
 		if (CFG_INPUT_MASK(def[i].type) > CFG_INPUT_STR) {
-			LOG(L_ERR, "ERROR: register_cfg_def(): %s.%s: unsupported input type\n",
+			LM_ERR("%s.%s: unsupported input type\n",
 					group_name, def[i].name);
 			goto error;
 		}
 
 		if (def[i].type & CFG_ATOMIC) {
 			if (CFG_VAR_MASK(def[i].type) != CFG_VAR_INT) {
-				LOG(L_ERR, "ERROR: register_cfg_def(): %s.%s: atomic change is allowed "
+				LM_ERR("%s.%s: atomic change is allowed "
 						"only for integer types\n",
 						group_name, def[i].name);
 				goto error;
 			}
 			if (def[i].on_set_child_cb) {
-				LOG(L_ERR, "ERROR: register_cfg_def(): %s.%s: per-child process callback "
+				LM_ERR("%s.%s: per-child process callback "
 						"does not work together with atomic change\n",
 						group_name, def[i].name);
 				goto error;
@@ -127,13 +127,13 @@ int cfg_declare(char *group_name, cfg_def_t *def, void *values, int def_size,
 		}
 	}
 
-	/* fix the computed size (char*, str or pointer members will force 
+	/* fix the computed size (char*, str or pointer members will force
 	   structure padding to multiple of sizeof(pointer)) */
 	if (types & ((1<<CFG_VAR_STRING)|(1<<CFG_VAR_STR)|(1<<CFG_VAR_POINTER)))
 		size=ROUND_POINTER(size);
 	/* minor validation */
 	if (size != def_size) {
-		LOG(L_ERR, "ERROR: register_cfg_def(): the specified size (%i) of the config "
+		LM_ERR("the specified size (%i) of the config "
 			"structure does not equal with the calculated size (%i), check whether "
 			"the variable types are correctly defined!\n", def_size, size);
 		goto error;
@@ -152,8 +152,7 @@ int cfg_declare(char *group_name, cfg_def_t *def, void *values, int def_size,
 	if ((group = cfg_lookup_group(group_name, group_name_len))) {
 		if (group->dynamic != CFG_GROUP_UNKNOWN) {
 			/* conflict with another module/core group, or with a dynamic group */
-			LOG(L_ERR, "ERROR: register_cfg_def(): "
-				"configuration group has been already declared: %s\n",
+			LM_ERR("configuration group has been already declared: %s\n",
 				group_name);
 			goto error;
 		}
@@ -171,15 +170,14 @@ int cfg_declare(char *group_name, cfg_def_t *def, void *values, int def_size,
 	/* notify the drivers about the new config definition */
 	cfg_notify_drivers(group_name, group_name_len, def);
 
-	LOG(L_DBG, "DEBUG: register_cfg_def(): "
-		"new config group has been registered: '%s' (num=%d, size=%d)\n",
+	LM_DBG("new config group has been registered: '%s' (num=%d, size=%d)\n",
 		group_name, num, size);
 
 	return 0;
 
 error:
 	if (mapping) pkg_free(mapping);
-	LOG(L_ERR, "ERROR: register_cfg_def(): Failed to register the config group: %s\n",
+	LM_ERR("failed to register the config group: %s\n",
 			group_name);
 
 	return -1;
@@ -214,12 +212,12 @@ int cfg_declare_str(char *group_name, char *var_name, char *val, char *descr)
 		len = strlen(val);
 		var->val.s.s = (char *)pkg_malloc(sizeof(char) * (len + 1));
 		if (!var->val.s.s) {
-			LOG(L_ERR, "ERROR: cfg_declare_str(): not enough memory\n");
+			LM_ERR("not enough memory\n");
 			return -1;
 		}
 		memcpy(var->val.s.s, val, len + 1);
 		var->val.s.len = len;
-	} else {	
+	} else {
 		var->val.s.s = NULL;
 		var->val.s.len = 0;
 	}

src/core/cfg/cfg_script.c

@@ -38,10 +38,10 @@ cfg_script_var_t *new_cfg_script_var(char *gname, char *vname, unsigned int type
 	cfg_script_var_t	*var;
 	int	gname_len, vname_len, descr_len;
 
-	LOG(L_DBG, "DEBUG: new_cfg_script_var(): declaring %s.%s\n", gname, vname);
+	LM_DBG("declaring %s.%s\n", gname, vname);
 
 	if (cfg_shmized) {
-		LOG(L_ERR, "ERROR: new_cfg_script_var(): too late variable declaration, "
+		LM_ERR("too late variable declaration, "
 			"the config has been already shmized\n");
 		return NULL;
 	}
@@ -53,8 +53,7 @@ cfg_script_var_t *new_cfg_script_var(char *gname, char *vname, unsigned int type
 	if (group) {
 		if (group->dynamic == CFG_GROUP_STATIC) {
 			/* the group has been already declared by a module or by the core */
-			LOG(L_ERR, "ERROR: new_cfg_script_var(): "
-				"configuration group has been already declared: %s\n",
+			LM_ERR("configuration group has been already declared: %s\n",
 				gname);
 			return NULL;
 		}
@@ -66,8 +65,7 @@ cfg_script_var_t *new_cfg_script_var(char *gname, char *vname, unsigned int type
 		) {
 			if ((var->name_len == vname_len) &&
 			(memcmp(var->name, vname, vname_len) == 0)) {
-				LOG(L_ERR, "ERROR: new_cfg_script_var(): variable already exists: %s.%s\n",
-						gname, vname);
+				LM_ERR("variable already exists: %s.%s\n", gname, vname);
 				return NULL;
 			}
 		}
@@ -80,7 +78,6 @@ cfg_script_var_t *new_cfg_script_var(char *gname, char *vname, unsigned int type
 		group = cfg_new_group(gname, gname_len,
 					0 /* num */, NULL /* mapping */,
 					NULL /* vars */, 0 /* size */, NULL /* handle */);
-					
 		if (!group) goto error;
 		group->dynamic = CFG_GROUP_DYNAMIC;
 	}
@@ -97,15 +94,15 @@ cfg_script_var_t *new_cfg_script_var(char *gname, char *vname, unsigned int type
 		break;
 
 	default:
-		LOG(L_ERR, "ERROR: new_cfg_script_var(): unsupported variable type\n");
+		LM_ERR("unsupported variable type\n");
 		return NULL;
 	}
 
 	group->num++;
 	if (group->num > CFG_MAX_VAR_NUM) {
-		LOG(L_ERR, "ERROR: new_cfg_script_var(): too many variables (%d) within a single group,"
-			" the limit is %d. Increase CFG_MAX_VAR_NUM, or split the group into multiple"
-			" definitions.\n",
+		LM_ERR("too many variables (%d) within a single group,"
+				" the limit is %d. Increase CFG_MAX_VAR_NUM, or split the group"
+				" into multiple definitions.\n",
 			group->num, CFG_MAX_VAR_NUM);
 		return NULL;
 	}
@@ -136,7 +133,7 @@ cfg_script_var_t *new_cfg_script_var(char *gname, char *vname, unsigned int type
 	return var;
 
 error:
-	LOG(L_ERR, "ERROR: new_cfg_script_var(): not enough memory\n");
+	LM_ERR("not enough memory\n");
 	return NULL;
 }
 
@@ -154,7 +151,7 @@ int cfg_set_script_var(cfg_group_t *group, str *var_name,
 	str	s;
 
 	if (cfg_shmized || (group->dynamic != CFG_GROUP_DYNAMIC)) {
-		LOG(L_ERR, "BUG: cfg_set_script_var(): Not a dynamic group before forking\n");
+		LM_ERR("not a dynamic group before forking\n");
 		return -1;
 	}
 
@@ -172,7 +169,7 @@ int cfg_set_script_var(cfg_group_t *group, str *var_name,
 				if ((var->min || var->max)
 					&& ((var->min > (int)(long)v) || (var->max < (int)(long)v))
 				) {
-					LOG(L_ERR, "ERROR: cfg_set_script_var(): integer value is out of range\n");
+					LM_ERR("integer value is out of range\n");
 					goto error;
 				}
 				var->val.i = (int)(long)v;
@@ -185,7 +182,7 @@ int cfg_set_script_var(cfg_group_t *group, str *var_name,
 					s.len = ((str *)v)->len;
 					s.s = pkg_malloc(sizeof(char) * (s.len + 1));
 					if (!s.s) {
-						LOG(L_ERR, "ERROR: cfg_set_script_var(): not enough memory\n");
+						LM_ERR("not enough memory\n");
 						goto error;
 					}
 					memcpy(s.s, ((str *)v)->s, s.len);
@@ -200,7 +197,7 @@ int cfg_set_script_var(cfg_group_t *group, str *var_name,
 				break;
 
 			default:
-				LOG(L_ERR, "ERROR: cfg_set_script_var(): unsupported variable type\n");
+				LM_ERR("unsupported variable type\n");
 				goto error;
 			}
 
@@ -212,7 +209,7 @@ int cfg_set_script_var(cfg_group_t *group, str *var_name,
 	return 1;
 
 error:
-	LOG(L_ERR, "ERROR: cfg_set_script_var(): failed to set the script variable: %.*s.%.*s\n",
+	LM_ERR("failed to set the script variable: %.*s.%.*s\n",
 			group->name_len, group->name,
 			var_name->len, var_name->s);
 	return -1;
@@ -314,7 +311,7 @@ error:
 	if (def) pkg_free(def);
 	if (handle) pkg_free(handle);
 
-	LOG(L_ERR, "ERROR: cfg_script_fixup(): not enough memory\n");
+	LM_ERR("not enough memory\n");
 	return -1;
 }
 
@@ -341,7 +338,7 @@ void cfg_script_destroy(cfg_group_t *group)
 	script_var = (cfg_script_var_t *)group->vars;
 	while (script_var) {
 		script_var2 = script_var->next;
-		if ((script_var->type == CFG_VAR_STR) && script_var->val.s.s) 
+		if ((script_var->type == CFG_VAR_STR) && script_var->val.s.s)
 			pkg_free(script_var->val.s.s);
 		pkg_free(script_var);
 		script_var = script_var2;