kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 04:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace strdupa with more portable ast_strdupa

Browse Source 
The strdupa function is a GNU extension, and not widely portable. We
have an ast_strdupa function used within Asterisk which is preferred.
I pulled the definition up from menuselect.c into the menuselect.h
header file so it can be shared across menuselect.

Change-Id: I9593c97f78386b47dc1e83201e80cb2f62b36c2e
This commit is contained in:
David M. Lee
2016-07-27 09:56:29 -05:00
parent ba449e0242
commit 47689998a9
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
menuselect/menuselect.c
View File

@@ -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)
{

12
menuselect/menuselect.h
View File

@@ -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 */

2
menuselect/menuselect_curses.c
View File

@@ -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;