|
@@ -64,18 +64,18 @@ int set_mod_param_regex(char* regex, char* name, modparam_t type, void* val)
|
|
str s;
|
|
str s;
|
|
|
|
|
|
if (!regex) {
|
|
if (!regex) {
|
|
- LOG(L_ERR, "set_mod_param_regex(): Invalid mod parameter value\n");
|
|
|
|
|
|
+ LM_ERR("Invalid mod parameter value\n");
|
|
return -5;
|
|
return -5;
|
|
}
|
|
}
|
|
if (!name) {
|
|
if (!name) {
|
|
- LOG(L_ERR, "set_mod_param_regex(): Invalid name parameter value\n");
|
|
|
|
|
|
+ LM_ERR("Invalid name parameter value\n");
|
|
return -6;
|
|
return -6;
|
|
}
|
|
}
|
|
|
|
|
|
len = strlen(regex);
|
|
len = strlen(regex);
|
|
reg = pkg_malloc(len + 2 + 1);
|
|
reg = pkg_malloc(len + 2 + 1);
|
|
if (reg == 0) {
|
|
if (reg == 0) {
|
|
- LOG(L_ERR, "set_mod_param_regex(): No memory left\n");
|
|
|
|
|
|
+ LM_ERR("No memory left\n");
|
|
return -1;
|
|
return -1;
|
|
}
|
|
}
|
|
reg[0] = '^';
|
|
reg[0] = '^';
|
|
@@ -84,7 +84,7 @@ int set_mod_param_regex(char* regex, char* name, modparam_t type, void* val)
|
|
reg[len + 2] = '\0';
|
|
reg[len + 2] = '\0';
|
|
|
|
|
|
if (regcomp(&preg, reg, REG_EXTENDED | REG_NOSUB | REG_ICASE)) {
|
|
if (regcomp(&preg, reg, REG_EXTENDED | REG_NOSUB | REG_ICASE)) {
|
|
- LOG(L_ERR, "set_mod_param_regex(): Error while compiling regular expression\n");
|
|
|
|
|
|
+ LM_ERR("Error while compiling regular expression\n");
|
|
pkg_free(reg);
|
|
pkg_free(reg);
|
|
return -2;
|
|
return -2;
|
|
}
|
|
}
|
|
@@ -123,7 +123,7 @@ int set_mod_param_regex(char* regex, char* name, modparam_t type, void* val)
|
|
case PARAM_STRING:
|
|
case PARAM_STRING:
|
|
*((char**)ptr) = pkg_malloc(strlen((char*)val2)+1);
|
|
*((char**)ptr) = pkg_malloc(strlen((char*)val2)+1);
|
|
if (!*((char**)ptr)) {
|
|
if (!*((char**)ptr)) {
|
|
- LOG(L_ERR, "set_mod_param_regex(): No memory left\n");
|
|
|
|
|
|
+ LM_ERR("No memory left\n");
|
|
regfree(&preg);
|
|
regfree(&preg);
|
|
pkg_free(reg);
|
|
pkg_free(reg);
|
|
return -1;
|
|
return -1;
|
|
@@ -134,7 +134,7 @@ int set_mod_param_regex(char* regex, char* name, modparam_t type, void* val)
|
|
case PARAM_STR:
|
|
case PARAM_STR:
|
|
((str*)ptr)->s = pkg_malloc(((str*)val2)->len+1);
|
|
((str*)ptr)->s = pkg_malloc(((str*)val2)->len+1);
|
|
if (!((str*)ptr)->s) {
|
|
if (!((str*)ptr)->s) {
|
|
- LOG(L_ERR, "set_mod_param_regex(): No memory left\n");
|
|
|
|
|
|
+ LM_ERR("No memory left\n");
|
|
regfree(&preg);
|
|
regfree(&preg);
|
|
pkg_free(reg);
|
|
pkg_free(reg);
|
|
return -1;
|
|
return -1;
|
|
@@ -151,9 +151,8 @@ int set_mod_param_regex(char* regex, char* name, modparam_t type, void* val)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
else {
|
|
else {
|
|
- LOG(L_ERR, "set_mod_param_regex: parameter <%s>"
|
|
|
|
- " of type <%d> not found in"
|
|
|
|
- " module <%s>\n", name, type, t->exports.name);
|
|
|
|
|
|
+ LM_ERR("parameter <%s> of type <%d> not found in module <%s>\n",
|
|
|
|
+ name, type, t->exports.name);
|
|
regfree(&preg);
|
|
regfree(&preg);
|
|
pkg_free(reg);
|
|
pkg_free(reg);
|
|
return -3;
|
|
return -3;
|
|
@@ -164,7 +163,7 @@ int set_mod_param_regex(char* regex, char* name, modparam_t type, void* val)
|
|
regfree(&preg);
|
|
regfree(&preg);
|
|
pkg_free(reg);
|
|
pkg_free(reg);
|
|
if (!mod_found) {
|
|
if (!mod_found) {
|
|
- LOG(L_ERR, "set_mod_param_regex: No module matching <%s> found\n", regex);
|
|
|
|
|
|
+ LM_ERR("No module matching <%s> found\n", regex);
|
|
return -4;
|
|
return -4;
|
|
}
|
|
}
|
|
return 0;
|
|
return 0;
|