[sr-dev] git:master: modules/sdpops: use ser_memmem from core

Module: sip-router Branch: master Commit: 5c25ba35f37d2a9774caec7215261687c2ad17a0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5c25ba3… Author: Juha Heinanen &lt;jh(a)tutpro.com&gt; Committer: Juha Heinanen &lt;jh(a)tutpro.com&gt; Date: Wed Apr 9 20:35:58 2014 +0300 modules/sdpops: use ser_memmem from core --- modules/sdpops/sdpops_mod.c | 34 +--------------------------------- 1 files changed, 1 insertions(+), 33 deletions(-) diff --git a/modules/sdpops/sdpops_mod.c b/modules/sdpops/sdpops_mod.c index 33ca1de..16ce98d 100644 --- a/modules/sdpops/sdpops_mod.c +++ b/modules/sdpops/sdpops_mod.c @@ -35,6 +35,7 @@ #include "../../parser/sdp/sdp_helpr_funcs.h" #include "../../trim.h" #include "../../data_lump.h" +#include "../../ut.h" #include "api.h" #include "sdpops_data.h" @@ -903,39 +904,6 @@ static int w_sdp_remove_media(sip_msg_t* msg, char* media, char *bar) } -/* - * ser_memmem() returns the location of the first occurrence of data - * pattern b2 of size len2 in memory block b1 of size len1 or - * NULL if none is found. Obtained from NetBSD. - */ -void * -ser_memmem(const void *b1, const void *b2, size_t len1, size_t len2) -{ - /* Initialize search pointer */ - char *sp = (char *) b1; - - /* Initialize pattern pointer */ - char *pp = (char *) b2; - - /* Initialize end of search address space pointer */ - char *eos = sp + len1 - len2; - - /* Sanity check */ - if(!(b1 && b2 && len1 && len2)) - return NULL; - - while (sp <= eos) { - if (*sp == *pp) - if (memcmp(sp, pp, len2) == 0) - return sp; - - sp++; - } - - return NULL; -} - - /** * @brief check 'media' matches the value of any 'm=media port value ...' lines * @return -1 - error; 0 - not found; 1 - found