summaryrefslogtreecommitdiff
path: root/include/asterisk/stringfields.h
diff options
context:
space:
mode:
authorTilghman Lesher <tilghman@meg.abyt.es>2008-12-02 00:37:21 +0000
committerTilghman Lesher <tilghman@meg.abyt.es>2008-12-02 00:37:21 +0000
commit3d4c0cd42147e08a0370f95d1d0135aeba6f3131 (patch)
tree36a15e8926ad865d79c9b2dda57bfcb7c4aa42a3 /include/asterisk/stringfields.h
parent4dc60e756014e2eff2c182445ecdba6f393cacf8 (diff)
Merged revisions 160207 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r160207 | tilghman | 2008-12-01 18:25:16 -0600 (Mon, 01 Dec 2008) | 3 lines Ensure that Asterisk builds with --enable-dev-mode, even on the latest gcc and glibc. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@160208 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/stringfields.h')
-rw-r--r--include/asterisk/stringfields.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/include/asterisk/stringfields.h b/include/asterisk/stringfields.h
index 4b1847415..20597a591 100644
--- a/include/asterisk/stringfields.h
+++ b/include/asterisk/stringfields.h
@@ -255,12 +255,16 @@ int __ast_string_field_init(struct ast_string_field_mgr *mgr,
const char *__d__ = (data); \
size_t __dlen__ = (__d__) ? strlen(__d__) + 1 : 1; \
const char **__p__ = (const char **) (ptr); \
+ char *__q__; \
if (__dlen__ == 1) \
*__p__ = __ast_string_field_empty; \
- else if (!__ast_string_field_ptr_grow(&(x)->__field_mgr, __dlen__, ptr)) \
- memcpy((char *) *__p__, __d__, __dlen__); \
- else if ((*__p__ = __ast_string_field_alloc_space(&(x)->__field_mgr, &(x)->__field_mgr_pool, __dlen__))) \
- memcpy((char *) *__p__, __d__, __dlen__); \
+ else if (!__ast_string_field_ptr_grow(&(x)->__field_mgr, __dlen__, ptr)) { \
+ __q__ = (char *) *__p__; \
+ memcpy(__q__, __d__, __dlen__); \
+ } else if ((*__p__ = __ast_string_field_alloc_space(&(x)->__field_mgr, &(x)->__field_mgr_pool, __dlen__))) { \
+ __q__ = (char *) *__p__; \
+ memcpy(__q__, __d__, __dlen__); \
+ } \
} while (0)
/*!