Module: kamailio Branch: master Commit: 851367053d6b4d64161a50fa7408d0dd750922d5 URL: https://github.com/kamailio/kamailio/commit/851367053d6b4d64161a50fa7408d0dd...

Author: Daniel-Constantin Mierla miconda@gmail.com Committer: Daniel-Constantin Mierla miconda@gmail.com Date: 2017-07-07T14:03:29+02:00

core: fixup helper function for two regex parameters

---

Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h

---

Diff: https://github.com/kamailio/kamailio/commit/851367053d6b4d64161a50fa7408d0dd... Patch: https://github.com/kamailio/kamailio/commit/851367053d6b4d64161a50fa7408d0dd...

---

diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index 4fd0fa4ca7..d817b75565 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -207,7 +207,7 @@ struct regex_fixup { int fixup_regexp_null(void** param, int param_no) { struct regex_fixup* re; - + if (param_no != 1) return E_UNSPEC; if ((re=pkg_malloc(sizeof(*re))) ==0) { @@ -226,11 +226,15 @@ int fixup_regexp_null(void** param, int param_no) return E_UNSPEC; }

+int fixup_regexp_regexp(void** param, int param_no) +{ + return fixup_regexp_null(param, 1); +}

int fixup_free_regexp_null(void** param, int param_no) { struct regex_fixup* re; - + if (param_no != 1) return E_UNSPEC; if (*param) { @@ -242,6 +246,11 @@ int fixup_free_regexp_null(void** param, int param_no) return 0; }

+int fixup_free_regexp_regexp(void** param, int param_no) +{ + return fixup_free_regexp_null(param, 1); +} + /* fixup_pvar_*() has to be written "by hand", since it needs to save the original pointer (the fixup users expects a pointer to the pv_spec_t in *param and hence the original value @@ -638,4 +647,4 @@ int fixup_free_spve_pvar(void** param, int param_no) if(param_no==2) return fixup_free_pvar_null(param, 1); return E_UNSPEC; -} \ No newline at end of file +} diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index a8388ee84d..835342ab86 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2008 iptelorg GmbH * * Permission to use, copy, modify, and distribute this software for any @@ -36,7 +36,7 @@ /** * generic parameter that holds a string, an int, a pseudo-variable * or a ser select, avp, or subst. - * + * * Note: used only for compatibility with existing kamailio code, * please use fparam_t directly in the future. * @@ -86,13 +86,8 @@ int fixup_uint_uint(void** param, int param_no);

int fixup_regexp_null(void** param, int param_no); int fixup_free_regexp_null(void** param, int param_no); -#if 0 -int fixup_regexp_none(void** param, int param_no); -int fixup_free_regexp_none(void** param, int param_no); -/* not implemened yet */ -int fixup_regexpNL_null(void** param, int param_no); -int fixup_regexpNL_none(void** param, int param_no); -#endif +int fixup_regexp_regexp(void** param, int param_no); +int fixup_free_regexp_regexp(void** param, int param_no);

int fixup_pvar_null(void **param, int param_no); int fixup_free_pvar_null(void** param, int param_no);