openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

vsh: remove namespace poisoning 

We already have a syntax-check to prohibit direct use of these
allocation functions.
This commit is contained in:
Ján Tomko 2016-06-20 17:11:39 +02:00
parent d0e5dd376f
commit 8ebf780e08
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/vsh.c
View File

@ -71,9 +71,6 @@
const vshCmdGrp *cmdGroups;
const vshCmdDef *cmdSet;
/* Bypass header poison */
#undef strdup
/* simple handler for oom conditions */
static void
@ -164,9 +161,6 @@ _vshStrdup(vshControl *ctl, const char *s, const char *filename, int line)
exit(EXIT_FAILURE);
}
/* Poison the raw allocating identifiers in favor of our vsh variants. */
#define strdup use_vshStrdup_instead_of_strdup
int
vshNameSorter(const void *a, const void *b)
{

10
tools/vsh.h
View File

@ -453,16 +453,6 @@ char *_vshStrdup(vshControl *ctl, const char *s, const char *filename,
int line);
# define vshStrdup(_ctl, _s) _vshStrdup(_ctl, _s, __FILE__, __LINE__)
/* Poison the raw allocating identifiers in favor of our vsh variants. */
# undef malloc
# undef calloc
# undef realloc
# undef strdup
# define malloc use_vshMalloc_instead_of_malloc
# define calloc use_vshCalloc_instead_of_calloc
# define realloc use_vshRealloc_instead_of_realloc
# define strdup use_vshStrdup_instead_of_strdup
/* Macros to help dealing with mutually exclusive options. */
/* VSH_EXCLUSIVE_OPTIONS_EXPR: