diff options
| author | Mikhail Gusarov <dottedmag@dottedmag.net> | 2010-06-04 16:58:58 +0700 |
|---|---|---|
| committer | Mikhail Gusarov <dottedmag@dottedmag.net> | 2010-06-11 19:04:23 +0700 |
| commit | 6592db6bb526f0c43b4c7b55859c629709e039b4 (patch) | |
| tree | 30d525b635170a94193c0a8837e1b36b609e757e /xkb/xkbUtils.c | |
| parent | 620ca54aaa0b363fcf68cec1bd6c37e68c988352 (diff) | |
Get rid of xstrdup when argument is definitely non-NULL
Replace xstrdup with strdup when either constant string is
being duplicated or argument is guarded by conditionals and
obviously can't be NULL
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Diffstat (limited to 'xkb/xkbUtils.c')
| -rw-r--r-- | xkb/xkbUtils.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c index 72dd546d4..3344e5088 100644 --- a/xkb/xkbUtils.c +++ b/xkb/xkbUtils.c @@ -1761,15 +1761,15 @@ _XkbCopyGeom(XkbDescPtr src, XkbDescPtr dst) if (sdoodad->any.type == XkbTextDoodad) { if (sdoodad->text.text) ddoodad->text.text = - xstrdup(sdoodad->text.text); + strdup(sdoodad->text.text); if (sdoodad->text.font) ddoodad->text.font = - xstrdup(sdoodad->text.font); + strdup(sdoodad->text.font); } else if (sdoodad->any.type == XkbLogoDoodad) { if (sdoodad->logo.logo_name) ddoodad->logo.logo_name = - xstrdup(sdoodad->logo.logo_name); + strdup(sdoodad->logo.logo_name); } } dsection->overlays = NULL; @@ -1832,14 +1832,14 @@ _XkbCopyGeom(XkbDescPtr src, XkbDescPtr dst) memcpy(ddoodad , sdoodad, sizeof(XkbDoodadRec)); if (sdoodad->any.type == XkbTextDoodad) { if (sdoodad->text.text) - ddoodad->text.text = xstrdup(sdoodad->text.text); + ddoodad->text.text = strdup(sdoodad->text.text); if (sdoodad->text.font) - ddoodad->text.font = xstrdup(sdoodad->text.font); + ddoodad->text.font = strdup(sdoodad->text.font); } else if (sdoodad->any.type == XkbLogoDoodad) { if (sdoodad->logo.logo_name) ddoodad->logo.logo_name = - xstrdup(sdoodad->logo.logo_name); + strdup(sdoodad->logo.logo_name); } } |