diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-02-13 21:36:03 -0800 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2017-03-03 21:33:34 +0100 |
| commit | bdfb52193b5a2c5e44969b11d997ce19f0310af9 (patch) | |
| tree | 7f2b93218eddb984f5ae27e0aa086393e184476c /nx-X11/programs/Xserver/xkb/xkbconfig.c | |
| parent | e61e9795c3d19b163ebea9a230c2acc718a70d79 (diff) | |
| download | nx-libs-bdfb52193b5a2c5e44969b11d997ce19f0310af9.tar.gz nx-libs-bdfb52193b5a2c5e44969b11d997ce19f0310af9.tar.bz2 nx-libs-bdfb52193b5a2c5e44969b11d997ce19f0310af9.zip | |
Replace _XkbDupString with Xstrdup
The two functions have identical semantics, including safely returning
NULL when NULL is passed in (which POSIX strdup does not guarantee).
Some callers could probably be adjusted to call libc strdup directly,
when we know the input is non-NULL.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
Diffstat (limited to 'nx-X11/programs/Xserver/xkb/xkbconfig.c')
| -rw-r--r-- | nx-X11/programs/Xserver/xkb/xkbconfig.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/xkb/xkbconfig.c b/nx-X11/programs/Xserver/xkb/xkbconfig.c index de138ef45..5fcd594bc 100644 --- a/nx-X11/programs/Xserver/xkb/xkbconfig.c +++ b/nx-X11/programs/Xserver/xkb/xkbconfig.c @@ -363,7 +363,7 @@ XkbCFAddModByName( XkbConfigRtrnPtr rtrn, last->merge= merge; last->name= NULL; } - last->name= _XkbDupString(name); + last->name= Xstrdup(name); } return last; } @@ -487,7 +487,7 @@ unsigned what; } if (*str!=NULL) _XkbFree(*str); - *str= _XkbDupString(val.str); + *str= Xstrdup(val.str); break; case _XkbCF_InitialMods: case _XkbCF_IgnoreLockMods: @@ -1046,7 +1046,7 @@ DefaultFinish( XkbConfigFieldsPtr fields, return DefaultCleanUp(rtrn); if (what==XkbCF_Check) { if ((rtrn->symbols==NULL)&&(rtrn->phys_symbols!=NULL)) - rtrn->symbols= _XkbDupString(rtrn->phys_symbols); + rtrn->symbols= Xstrdup(rtrn->phys_symbols); } if ((what==XkbCF_Apply)||(what==XkbCF_Check)) { if (xkb && xkb->names && (rtrn->num_unbound_mods>0)) |