diff options
author | zuul <zuul@gerrit.asterisk.org> | 2016-08-01 15:36:50 -0500 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-08-01 15:36:50 -0500 |
commit | 104b17eea90d00c8412a32611fdd8d25030589f2 (patch) | |
tree | d8dd2f1dc2e141b139d1089f91449131f9187a7e | |
parent | 1e64f4a295e2d4456053369063afddec8c8c122a (diff) | |
parent | df42f64d62cf6c158a391db4ff1b4c57b87dbf10 (diff) |
Merge "Replace strdupa with more portable ast_strdupa" into 13
-rw-r--r-- | menuselect/menuselect.c | 12 | ||||
-rw-r--r-- | menuselect/menuselect.h | 12 | ||||
-rw-r--r-- | menuselect/menuselect_curses.c | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/menuselect/menuselect.c b/menuselect/menuselect.c index efae311bb..f6a7fb39b 100644 --- a/menuselect/menuselect.c +++ b/menuselect/menuselect.c @@ -103,18 +103,6 @@ struct dep_file { }; AST_LIST_HEAD_NOLOCK_STATIC(deps_file, dep_file); -#if !defined(ast_strdupa) && defined(__GNUC__) -#define ast_strdupa(s) \ - (__extension__ \ - ({ \ - const char *__old = (s); \ - size_t __len = strlen(__old) + 1; \ - char *__new = __builtin_alloca(__len); \ - memcpy (__new, __old, __len); \ - __new; \ - })) -#endif - /*! \brief return a pointer to the first non-whitespace character */ static inline char *skip_blanks(char *str) { diff --git a/menuselect/menuselect.h b/menuselect/menuselect.h index 7b3fe2656..328ac9a0a 100644 --- a/menuselect/menuselect.h +++ b/menuselect/menuselect.h @@ -162,4 +162,16 @@ static inline int strlen_zero(const char *s) return (!s || (*s == '\0')); } +#if !defined(ast_strdupa) && defined(__GNUC__) +#define ast_strdupa(s) \ + (__extension__ \ + ({ \ + const char *__old = (s); \ + size_t __len = strlen(__old) + 1; \ + char *__new = __builtin_alloca(__len); \ + memcpy (__new, __old, __len); \ + __new; \ + })) +#endif + #endif /* MENUSELECT_H */ diff --git a/menuselect/menuselect_curses.c b/menuselect/menuselect_curses.c index e79957485..260cf69a7 100644 --- a/menuselect/menuselect_curses.c +++ b/menuselect/menuselect_curses.c @@ -211,7 +211,7 @@ static void display_mem_info(WINDOW *menu, struct member *mem, int start_y, int if (mem->displayname) { char buf[maxlen + 1]; - char *displayname = strdupa(mem->displayname); + char *displayname = ast_strdupa(mem->displayname); char *word; int current_line = 1; int new_line = 1; |