git:master:7e8b5ea7: pv: removed ifdefs for WITH_XAVP - sr-dev

18 Apr 2019

Module: kamailio
Branch: master
Commit: 7e8b5ea7a4068e5432589975b40aea59f85742d9
URL: https://github.com/kamailio/kamailio/commit/7e8b5ea7a4068e5432589975b40aea59...
Author: Daniel-Constantin Mierla miconda@gmail.com
Committer: Daniel-Constantin Mierla miconda@gmail.com
Date: 2019-04-18T14:08:49+02:00
pv: removed ifdefs for WITH_XAVP
---
Modified: src/modules/pv/pv.c
Modified: src/modules/pv/pv_xavp.c
Modified: src/modules/pv/pv_xavp.h
---
Diff:  https://github.com/kamailio/kamailio/commit/7e8b5ea7a4068e5432589975b40aea59...
Patch: https://github.com/kamailio/kamailio/commit/7e8b5ea7a4068e5432589975b40aea59...
---

diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c
index c065dca5d2..515321e313 100644
--- a/src/modules/pv/pv.c
+++ b/src/modules/pv/pv.c
@@ -40,9 +40,7 @@
 #include "pv_time.h"
 #include "pv_trans.h"
 #include "pv_select.h"
-#ifdef WITH_XAVP
 #include "pv_xavp.h"
-#endif
 #include "pv_api.h"
MODULE_VERSION
@@ -92,12 +90,9 @@ static pv_export_t mod_pvs[] = {
    	pv_parse_snd_name, 0, 0, 0 },
    { {"rcv", (sizeof("rcv")-1)}, PVT_OTHER, pv_get_rcv, 0,
    	pv_parse_rcv_name, 0, 0, 0 },
-#ifdef WITH_XAVP
    { {"xavp", sizeof("xavp")-1}, /* xavp */
    	PVT_XAVP, pv_get_xavp, pv_set_xavp,
    	pv_parse_xavp_name, 0, 0, 0 },
-#endif
-
    {{"avp", (sizeof("avp")-1)}, PVT_AVP, pv_get_avp, pv_set_avp,
    	pv_parse_avp_name, pv_parse_index, 0, 0},
    {{"hdr", (sizeof("hdr")-1)}, PVT_HDR, pv_get_hdr, 0, pv_parse_hdr_name,
@@ -565,14 +560,12 @@ static cmd_export_t cmds[]={
    	ANY_ROUTE },
    {"pv_unset",  (cmd_function)pv_unset,  1, fixup_pvar_null, 0,
    	ANY_ROUTE },
-#ifdef WITH_XAVP
    {"pv_xavp_print",  (cmd_function)pv_xavp_print,  0, 0, 0,
    	ANY_ROUTE },
    {"pv_var_to_xavp",  (cmd_function)w_var_to_xavp, 2, fixup_spve_spve,
    	fixup_free_spve_spve, ANY_ROUTE },
    {"pv_xavp_to_var",  (cmd_function)w_xavp_to_var, 1, fixup_spve_null,
    	fixup_free_spve_null, ANY_ROUTE },
-#endif
    {"is_int", (cmd_function)is_int, 1, fixup_pvar_null, fixup_free_pvar_null,
    	ANY_ROUTE},
    {"typeof", (cmd_function)pv_typeof,       2, fixup_pvar_none,
diff --git a/src/modules/pv/pv_xavp.c b/src/modules/pv/pv_xavp.c
index c36a6c6f1f..a627f2ae1b 100644
--- a/src/modules/pv/pv_xavp.c
+++ b/src/modules/pv/pv_xavp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Daniel-Constantin Mierla (asipto.com) 
+ * Copyright (C) 2009 Daniel-Constantin Mierla (asipto.com)
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,8 +14,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef WITH_XAVP
-
 #include <stdio.h>
#include "../../core/dprint.h"
@@ -753,4 +751,3 @@ int pv_xavp_to_var(str *xname) {
    } while(xavp);
    return 1;
 }
-#endif
diff --git a/src/modules/pv/pv_xavp.h b/src/modules/pv/pv_xavp.h
index 90bc9da762..35c410931e 100644
--- a/src/modules/pv/pv_xavp.h
+++ b/src/modules/pv/pv_xavp.h
@@ -13,12 +13,10 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
- 
+
 #ifndef _PV_XAVP_H_
 #define _PV_XAVP_H_
-#ifdef WITH_XAVP
-
 #include "../../core/pvar.h"
 #include "pv_svar.h"
@@ -36,4 +34,3 @@ int pv_var_to_xavp(str *varname, str *xname);
 int pv_xavp_to_var(str *xname);
#endif
-#endif

    