aboutsummaryrefslogtreecommitdiff
path: root/libX11/src
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-03-11 09:17:45 +0100
committermarha <marha@users.sourceforge.net>2013-03-11 09:17:45 +0100
commit514e0809a42027e2178bf0eccd526a08da60f399 (patch)
tree6ee95fe742214f0fe4b20ca8b444d0cfeea67faf /libX11/src
parent84798668341b15890d625e3bffbbc2d19f434568 (diff)
downloadvcxsrv-514e0809a42027e2178bf0eccd526a08da60f399.tar.gz
vcxsrv-514e0809a42027e2178bf0eccd526a08da60f399.tar.bz2
vcxsrv-514e0809a42027e2178bf0eccd526a08da60f399.zip
fontconfig libX11 mesa pixman xserver xkeyboard-config git update 11 Mar
2013 xserver commit 5047810a4c20fab444b8c6eb146c55dcdb0d4219 xkeyboard-config commit 2ed85c1e936f7cd4a9540ace5c12b9fec60ee1fb libX11 commit 3996543c1b2919e97d61a5d70fe1ebd7cd76fc83 pixman commit aaae3d8eefa069098e9014822817ca1429fdea46 fontconfig commit bdf1581e3de5528f397f19bfd4ca9caaf9e7fe4a mesa commit b21a9d46e4be0c666327569f07b9cddeb4d42d38
Diffstat (limited to 'libX11/src')
-rw-r--r--libX11/src/GetFProp.c27
-rw-r--r--libX11/src/PropAlloc.c7
-rw-r--r--libX11/src/udcInf.c8
3 files changed, 17 insertions, 25 deletions
diff --git a/libX11/src/GetFProp.c b/libX11/src/GetFProp.c
index 27ec98b72..1e0cd3285 100644
--- a/libX11/src/GetFProp.c
+++ b/libX11/src/GetFProp.c
@@ -29,27 +29,24 @@ in this Software without prior written authorization from The Open Group.
#endif
#include "Xlibint.h"
-Bool XGetFontProperty (
+Bool
+XGetFontProperty(
XFontStruct *fs,
register Atom name,
unsigned long *valuePtr)
{
/* XXX this is a simple linear search for now. If the
- protocol is changed to sort the property list, this should
- become a binary search. */
+ protocol is changed to sort the property list, this should
+ become a binary search. */
register XFontProp *prop = fs->properties;
register XFontProp *last = prop + fs->n_properties;
+
while (prop != last) {
- if (prop->name == name) {
- *valuePtr = prop->card32;
- return (1);
- }
- prop++;
- }
- return (0);
+ if (prop->name == name) {
+ *valuePtr = prop->card32;
+ return (1);
+ }
+ prop++;
}
-
-
-
-
-
+ return (0);
+}
diff --git a/libX11/src/PropAlloc.c b/libX11/src/PropAlloc.c
index bad768153..516283080 100644
--- a/libX11/src/PropAlloc.c
+++ b/libX11/src/PropAlloc.c
@@ -58,12 +58,7 @@ XWMHints *XAllocWMHints (void)
XClassHint *XAllocClassHint (void)
{
- register XClassHint *h;
-
- if ((h = (XClassHint *) Xcalloc (1, (unsigned) sizeof (XClassHint))))
- h->res_name = h->res_class = NULL;
-
- return h;
+ return Xcalloc (1, sizeof (XClassHint));
}
diff --git a/libX11/src/udcInf.c b/libX11/src/udcInf.c
index db7ad10f3..b7577ac96 100644
--- a/libX11/src/udcInf.c
+++ b/libX11/src/udcInf.c
@@ -702,14 +702,14 @@ int *num_gi;
_XlcCloseConverter(conv);
_XlcDestroyLC(lcd);
- *gi = (_XUDCGIInf *)Xmalloc(sizeof(_XUDCGIInf));
- (*gi)->charset_str = (char *)Xmalloc(strlen(charsetname)+1);
- strcpy((*gi)->charset_str,charsetname);
- (*gi)->glyph_index = glyph;
+ *gi = Xmalloc(sizeof(_XUDCGIInf));
if(*gi == NULL){
_xudc_utyerrno = 0x03 ;
return(_XUDC_ERROR);
}
+ (*gi)->charset_str = Xmalloc(strlen(charsetname)+1);
+ strcpy((*gi)->charset_str,charsetname);
+ (*gi)->glyph_index = glyph;
*num_gi = 1;
return(0);
}