From 446d6308d0f3fddeedfc8e4881108caa6f1facc7 Mon Sep 17 00:00:00 2001 From: "7u83@mail.ru" <7u83@mail.ru@noemail.net> Date: Sat, 31 Jan 2015 11:29:27 +0000 Subject: [PATCH] Function behaviour changed. FossilOrigin-Name: 09a2a2413e6ddbf1b4b5350fe443c7036ad17e6e118cb9fc44da4555393a5d32 --- src/capwap/bstr.h | 3 +++ src/capwap/bstr_replace.c | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/capwap/bstr.h b/src/capwap/bstr.h index 50f95016..16683ea4 100644 --- a/src/capwap/bstr.h +++ b/src/capwap/bstr.h @@ -3,5 +3,8 @@ extern uint8_t * bstr_create(uint8_t *data, uint8_t len); +extern uint8_t * bstr_create_from_cfgstr(const char * s); +extern uint8_t * bstr_replace( uint8_t ** dst, uint8_t * bstr); + #define bstr_len(s) (*s) diff --git a/src/capwap/bstr_replace.c b/src/capwap/bstr_replace.c index e6d9c0c4..fa011c5e 100644 --- a/src/capwap/bstr_replace.c +++ b/src/capwap/bstr_replace.c @@ -2,11 +2,11 @@ #include "bstr.h" -uint8_t * bstr_replace( uint8_t ** str, uint8_t * data, int len) +uint8_t * bstr_replace( uint8_t ** dst, uint8_t * bstr) { - if (str) - free(str); - - *str = bstr_create(data,len); - return *str; + if (*dst) + free(*dst); + + *dst = bstr; + return *dst; }