[sr-dev] git:master:7dcc6bd1: Update jansson_path.c

GitHub noreply at github.com
Tue Jan 31 12:23:26 CET 2017


Module: kamailio
Branch: master
Commit: 7dcc6bd18b5b5ae4078c32087c6cf85c0fa9bce1
URL: https://github.com/kamailio/kamailio/commit/7dcc6bd18b5b5ae4078c32087c6cf85c0fa9bce1

Author: Vasiliy Ganchev <vance at ukr.net>
Committer: GitHub <noreply at github.com>
Date: 2017-01-31T08:29:08+02:00

Update jansson_path.c

in case of build on old debian (lenny) - statically linked libjansson has to be used, as a result build throw errors, cos libjansson has functions with the same names

---

Modified: src/modules/jansson/jansson_path.c

---

Diff:  https://github.com/kamailio/kamailio/commit/7dcc6bd18b5b5ae4078c32087c6cf85c0fa9bce1.diff
Patch: https://github.com/kamailio/kamailio/commit/7dcc6bd18b5b5ae4078c32087c6cf85c0fa9bce1.patch

---

diff --git a/src/modules/jansson/jansson_path.c b/src/modules/jansson/jansson_path.c
index 095146c..b6f76bc 100644
--- a/src/modules/jansson/jansson_path.c
+++ b/src/modules/jansson/jansson_path.c
@@ -18,9 +18,9 @@
 #include "../../core/mod_fix.h"
 
 /* jansson private helper functions */
-void *jsonp_malloc(size_t size);
-void jsonp_free(void *ptr);
-char *jsonp_strdup(const char *str);
+static void *jsonp_malloc(size_t size);
+static void jsonp_free(void *ptr);
+static char *jsonp_strdup(const char *str);
 
 static json_malloc_t do_malloc = malloc;
 static json_free_t do_free = free;
@@ -252,21 +252,21 @@ int json_path_set(json_t *json, const char *path, json_t *value,
 }
 
 /* jansson private helper functions */
-void *jsonp_malloc(size_t size) {
+static void *jsonp_malloc(size_t size) {
 	if(!size)
 		return NULL;
 
 	return (*do_malloc)(size);
 }
 
-void jsonp_free(void *ptr) {
+static void jsonp_free(void *ptr) {
 	if(!ptr)
 		return;
 
 	(*do_free)(ptr);
 }
 
-char *jsonp_strdup(const char *str) {
+static char *jsonp_strdup(const char *str) {
 	char *new_str;
 
 	new_str = jsonp_malloc(strlen(str) + 1); 




More information about the sr-dev mailing list