Module Name: xsrc
Committed By: mrg
Date: Wed Aug 3 03:06:00 UTC 2011
Modified Files:
xsrc/external/mit/libX11/dist/modules/lc/gen: lcGenConv.c
xsrc/external/mit/libX11/dist/src/xlibi18n: XlcDL.c
Removed Files:
xsrc/external/mit/libX11/dist/man: XFreeModifierMap.man
xsrc/external/mit/libX11/dist/specs: xmlrules.in
Log Message:
merge libX11 1.4.4
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libX11/dist/man/XFreeModifierMap.man
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libX11/dist/specs/xmlrules.in
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libX11/dist/src/xlibi18n/XlcDL.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c
diff -u xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c:1.3 xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c:1.4
--- xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c:1.3 Sat Jul 23 11:11:58 2011
+++ xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c Wed Aug 3 03:06:00 2011
@@ -2680,10 +2680,9 @@
*conv->methods = *methods;
conv->methods->reset = init_state;
- conv->state = (XPointer) Xmalloc(sizeof(StateRec));
+ conv->state = Xcalloc(1, sizeof(StateRec));
if (conv->state == NULL)
goto err;
- bzero((char *) conv->state, sizeof(StateRec));
state = (State) conv->state;
state->lcd = lcd;
Index: xsrc/external/mit/libX11/dist/src/xlibi18n/XlcDL.c
diff -u xsrc/external/mit/libX11/dist/src/xlibi18n/XlcDL.c:1.5 xsrc/external/mit/libX11/dist/src/xlibi18n/XlcDL.c:1.6
--- xsrc/external/mit/libX11/dist/src/xlibi18n/XlcDL.c:1.5 Wed Feb 23 08:04:05 2011
+++ xsrc/external/mit/libX11/dist/src/xlibi18n/XlcDL.c Wed Aug 3 03:06:00 2011
@@ -86,16 +86,6 @@
#include "XlcPublic.h"
#include "XlcPubI.h"
-#if !defined(__NetBSD__) && defined(_LP64) && defined(__sparcv9)
-# define _MACH64_NAME "sparcv9"
-#else
-# undef _MACH64_NAME
-#endif /* defined(_LP64) && defined(__sparcv9) */
-
-#ifdef _MACH64_NAME
-# define _MACH64_NAME_LEN (sizeof (_MACH64_NAME) - 1)
-#endif
-
#define XI18N_DLREL 2
#define iscomment(ch) ((ch) == '\0' || (ch) == '#')
@@ -269,35 +259,6 @@
if (strstr (dl_name, "../"))
return NULL;
-#if defined (_LP64) && defined (_MACH64_NAME)
- len = (lc_dir ? strlen(lc_dir) : 0 ) +
- (dl_name ? strlen(dl_name) : 0) + _MACH64_NAME_LEN + 10;
- path = Xmalloc(len + 1);
-
- if (strchr(dl_name, '/') != NULL) {
- char *tmp = strdup(dl_name);
- char *dl_dir, *dl_file;
- char *slash_p;
- slash_p = strchr(tmp, '/');
- *slash_p = '\0';
- dl_dir = tmp;
- dl_file = ++slash_p;
-
- slash_p = strrchr(lc_dir, '/');
- *slash_p = '\0';
- strcpy(path, lc_dir); strcat(path, "/");
- strcat(path, dl_dir); strcat(path, "/");
- strcat(path, _MACH64_NAME); strcat(path, "/");
- strcat(path, dl_file); strcat(path, ".so.2");
-
- *slash_p = '/';
- Xfree(tmp);
- } else {
- strcpy(path, lc_dir); strcat(path, "/");
- strcat(path, _MACH64_NAME); strcat(path, "/");
- strcat(path, dl_name); strcat(path, ".so.2");
- }
-#else
len = (lc_dir ? strlen(lc_dir) : 0 ) +
(dl_name ? strlen(dl_name) : 0) + 10;
#if defined POSTLOCALELIBDIR
@@ -322,7 +283,6 @@
#endif
strcat(path, dl_name); strcat(path, ".so.2");
}
-#endif
return path;
}
