Module: sip-router Branch: master Commit: 07afde0840cb537b281c250b34f0fd9e9576410c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=07afde08...
Author: Klaus Darilion klaus.mailinglists@pernau.at Committer: Klaus Darilion klaus.mailinglists@pernau.at Date: Wed Jul 1 14:36:11 2009 +0200
remove shm_str_dup() from tls_util.[c|h] as it breaks compilation and is not used at all
---
modules_s/tls/tls_util.c | 26 -------------------------- modules_s/tls/tls_util.h | 8 -------- 2 files changed, 0 insertions(+), 34 deletions(-)
diff --git a/modules_s/tls/tls_util.c b/modules_s/tls/tls_util.c index c2ac186..2b45531 100644 --- a/modules_s/tls/tls_util.c +++ b/modules_s/tls/tls_util.c @@ -40,32 +40,6 @@
/* - * Make a shared memory copy of str string - * Return value: -1 on error - * 0 on success - */ -int shm_str_dup(char** dest, str* val) -{ - char* ret; - - if (!val) { - *dest = NULL; - return 0; - } - - ret = shm_malloc(val->len + 1); - if (!ret) { - ERR("No memory left\n"); - return 1; - } - memcpy(ret, val->s, val->len); - ret[val->len] = '\0'; - *dest = ret; - return 0; -} - - -/* * Make a shared memory copy of ASCII zero terminated string * Return value: -1 on error * 0 on success diff --git a/modules_s/tls/tls_util.h b/modules_s/tls/tls_util.h index f699889..701ba2b 100644 --- a/modules_s/tls/tls_util.h +++ b/modules_s/tls/tls_util.h @@ -61,14 +61,6 @@ do { \
/* - * Make a shared memory copy of str string - * Return value: -1 on error - * 0 on success - */ -int shm_str_dup(char** dest, str* val); - - -/* * Make a shared memory copy of ASCII zero terminated string * Return value: -1 on error * 0 on success
This was actually unnecessary as I just found out that there is already a TLS module in "modules".
Anyway, now the old ser's tls module (without new features from Kamailio like servernameextension and tlsops pseudo variables) builds again.
But for cleanup I think it should be removed.
regards klaus
Klaus Darilion schrieb:
Module: sip-router Branch: master Commit: 07afde0840cb537b281c250b34f0fd9e9576410c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=07afde08...
Author: Klaus Darilion klaus.mailinglists@pernau.at Committer: Klaus Darilion klaus.mailinglists@pernau.at Date: Wed Jul 1 14:36:11 2009 +0200
remove shm_str_dup() from tls_util.[c|h] as it breaks compilation and is not used at all
modules_s/tls/tls_util.c | 26 -------------------------- modules_s/tls/tls_util.h | 8 -------- 2 files changed, 0 insertions(+), 34 deletions(-)
diff --git a/modules_s/tls/tls_util.c b/modules_s/tls/tls_util.c index c2ac186..2b45531 100644 --- a/modules_s/tls/tls_util.c +++ b/modules_s/tls/tls_util.c @@ -40,32 +40,6 @@
/*
- Make a shared memory copy of str string
- Return value: -1 on error
0 on success
- */
-int shm_str_dup(char** dest, str* val) -{
- char* ret;
- if (!val) {
*dest = NULL;
return 0;
- }
- ret = shm_malloc(val->len + 1);
- if (!ret) {
ERR("No memory left\n");
return 1;
- }
- memcpy(ret, val->s, val->len);
- ret[val->len] = '\0';
- *dest = ret;
- return 0;
-}
-/*
- Make a shared memory copy of ASCII zero terminated string
- Return value: -1 on error
0 on success
diff --git a/modules_s/tls/tls_util.h b/modules_s/tls/tls_util.h index f699889..701ba2b 100644 --- a/modules_s/tls/tls_util.h +++ b/modules_s/tls/tls_util.h @@ -61,14 +61,6 @@ do { \
/*
- Make a shared memory copy of str string
- Return value: -1 on error
0 on success
- */
-int shm_str_dup(char** dest, str* val);
-/*
- Make a shared memory copy of ASCII zero terminated string
- Return value: -1 on error
0 on success
sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev