diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-12 08:32:04 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-12 08:32:04 +0200 |
commit | 051d521f6e20761ba6831cecd91883da960fa931 (patch) | |
tree | b28abba7818115d2fed80eb360a79a0f9183948e /nx-X11/lib/X11/TextToStr.c | |
parent | 6dce607bad8711dd06a5a7b69ad1930386b4123b (diff) | |
parent | b8de7bf654929c823080b211aeac56cd213f5a32 (diff) | |
download | nx-libs-051d521f6e20761ba6831cecd91883da960fa931.tar.gz nx-libs-051d521f6e20761ba6831cecd91883da960fa931.tar.bz2 nx-libs-051d521f6e20761ba6831cecd91883da960fa931.zip |
Merge branch 'uli42-pr/upgrade_libX11' into 3.6.x
Attributes GH PR #214: https://github.com/ArcticaProject/nx-libs/pull/214
Fixes ArcticaProject/nx-libs#157.
Diffstat (limited to 'nx-X11/lib/X11/TextToStr.c')
-rw-r--r-- | nx-X11/lib/X11/TextToStr.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/nx-X11/lib/X11/TextToStr.c b/nx-X11/lib/X11/TextToStr.c index d8cf80c91..e75b7fcea 100644 --- a/nx-X11/lib/X11/TextToStr.c +++ b/nx-X11/lib/X11/TextToStr.c @@ -38,10 +38,10 @@ in this Software without prior written authorization from The Open Group. * null-separated STRING property. */ -Status XTextPropertyToStringList (tp, list_return, count_return) - XTextProperty *tp; - char ***list_return; - int *count_return; +Status XTextPropertyToStringList ( + XTextProperty *tp, + char ***list_return, + int *count_return) { char **list; /* return value */ int nelements; /* return value */ @@ -74,7 +74,7 @@ Status XTextPropertyToStringList (tp, list_return, count_return) */ list = (char **) Xmalloc (nelements * sizeof (char *)); if (!list) return False; - + start = (char *) Xmalloc ((datalen + 1) * sizeof (char)); /* for <NUL> */ if (!start) { Xfree ((char *) list); @@ -107,8 +107,7 @@ Status XTextPropertyToStringList (tp, list_return, count_return) } -void XFreeStringList (list) - char **list; +void XFreeStringList (char **list) { if (list) { if (list[0]) Xfree (list[0]); |