mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-05 12:16:00 +00:00
Replace strdupa with more portable ast_strdupa
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:
committed by
David M. Lee
parent
49461f37b7
commit
8802e55c26
@@ -103,18 +103,6 @@ struct dep_file {
|
|||||||
};
|
};
|
||||||
AST_LIST_HEAD_NOLOCK_STATIC(deps_file, 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 */
|
/*! \brief return a pointer to the first non-whitespace character */
|
||||||
static inline char *skip_blanks(char *str)
|
static inline char *skip_blanks(char *str)
|
||||||
{
|
{
|
||||||
|
@@ -162,4 +162,16 @@ static inline int strlen_zero(const char *s)
|
|||||||
return (!s || (*s == '\0'));
|
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 */
|
#endif /* MENUSELECT_H */
|
||||||
|
@@ -211,7 +211,7 @@ static void display_mem_info(WINDOW *menu, struct member *mem, int start_y, int
|
|||||||
|
|
||||||
if (mem->displayname) {
|
if (mem->displayname) {
|
||||||
char buf[maxlen + 1];
|
char buf[maxlen + 1];
|
||||||
char *displayname = strdupa(mem->displayname);
|
char *displayname = ast_strdupa(mem->displayname);
|
||||||
char *word;
|
char *word;
|
||||||
int current_line = 1;
|
int current_line = 1;
|
||||||
int new_line = 1;
|
int new_line = 1;
|
||||||
|
Reference in New Issue
Block a user