diff options
author | Ulrich Sibiller <uli42@gmx.de> | 2016-08-27 01:22:46 +0200 |
---|---|---|
committer | Ulrich Sibiller <uli42@gmx.de> | 2016-10-10 22:52:31 +0200 |
commit | 385dc2b070df1e19853a009bfe32204e0c5b2dd7 (patch) | |
tree | 6c18a91191560417fe9ae67ea10ca5905bc29fb2 /nx-X11/lib/X11/lcWrap.c | |
parent | e868fbbfdabe9cf45899054c8455d39acf800ede (diff) | |
download | nx-libs-385dc2b070df1e19853a009bfe32204e0c5b2dd7.tar.gz nx-libs-385dc2b070df1e19853a009bfe32204e0c5b2dd7.tar.bz2 nx-libs-385dc2b070df1e19853a009bfe32204e0c5b2dd7.zip |
update xlibi18n files to libX11 1.3.4
Diffstat (limited to 'nx-X11/lib/X11/lcWrap.c')
-rw-r--r-- | nx-X11/lib/X11/lcWrap.c | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/nx-X11/lib/X11/lcWrap.c b/nx-X11/lib/X11/lcWrap.c index b9f9a99e5..47581f8f8 100644 --- a/nx-X11/lib/X11/lcWrap.c +++ b/nx-X11/lib/X11/lcWrap.c @@ -43,15 +43,15 @@ from The Open Group. * OPEN SOFTWARE FOUNDATION AND TOSHIBA DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND * FITNESS, IN NO EVENT SHALL OPEN SOFTWARE FOUNDATIONN OR TOSHIBA BE - * LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * M. Collins OSF + * + * M. Collins OSF * * Katsuhisa Yano TOSHIBA Corp. - */ + */ #ifdef HAVE_CONFIG_H #include <config.h> @@ -94,7 +94,7 @@ XSetLocaleModifiers( } Bool -XSupportsLocale() +XSupportsLocale(void) { return _XlcCurrentLC() != (XLCd)NULL; } @@ -152,7 +152,7 @@ _XlcDefaultMapModifiers( #ifdef WIN32 { char *s; - for (s = mods; s = strchr(s, '@'); s++) { + for (s = mods; (s = strchr(s, '@')); s++) { for (s++; *s && *s != '='; s++) { if (*s == '#') { *s = '='; @@ -234,7 +234,7 @@ _XlcAddLoader( last = loader_list; while (last->next) last = last->next; - + loader->next = NULL; last->next = loader; } @@ -258,9 +258,9 @@ _XOpenLC( if (name == NULL) { name = setlocale (LC_CTYPE, (char *)NULL); #if !defined(X_LOCALE) - /* - * _XlMapOSLocaleName will return the same string or a substring - * of name, so strlen(name) is okay + /* + * _XlMapOSLocaleName will return the same string or a substring + * of name, so strlen(name) is okay */ if ((len = strlen(name)) >= sizeof sinamebuf) { siname = Xmalloc (len + 1); @@ -347,7 +347,7 @@ _XCloseLC( */ XLCd -_XlcCurrentLC() +_XlcCurrentLC(void) { XLCd lcd; static XLCd last_lcd = NULL; @@ -356,7 +356,7 @@ _XlcCurrentLC() if (last_lcd) _XCloseLC(last_lcd); - + last_lcd = lcd; return lcd; @@ -367,10 +367,10 @@ _XrmInitParseInfo( XPointer *state) { XLCd lcd = _XOpenLC((char *) NULL); - + if (lcd == (XLCd) NULL) return (XrmMethods) NULL; - + return (*lcd->methods->init_parse_info)(lcd, state); } @@ -382,7 +382,7 @@ XmbTextPropertyToTextList( int *count_ret) { XLCd lcd = _XlcCurrentLC(); - + if (lcd == NULL) return XLocaleNotSupported; @@ -398,7 +398,7 @@ XwcTextPropertyToTextList( int *count_ret) { XLCd lcd = _XlcCurrentLC(); - + if (lcd == NULL) return XLocaleNotSupported; @@ -414,7 +414,7 @@ Xutf8TextPropertyToTextList( int *count_ret) { XLCd lcd = _XlcCurrentLC(); - + if (lcd == NULL) return XLocaleNotSupported; @@ -431,7 +431,7 @@ XmbTextListToTextProperty( XTextProperty *text_prop) { XLCd lcd = _XlcCurrentLC(); - + if (lcd == NULL) return XLocaleNotSupported; @@ -448,7 +448,7 @@ XwcTextListToTextProperty( XTextProperty *text_prop) { XLCd lcd = _XlcCurrentLC(); - + if (lcd == NULL) return XLocaleNotSupported; @@ -465,7 +465,7 @@ Xutf8TextListToTextProperty( XTextProperty *text_prop) { XLCd lcd = _XlcCurrentLC(); - + if (lcd == NULL) return XLocaleNotSupported; @@ -478,7 +478,7 @@ XwcFreeStringList( wchar_t **list) { XLCd lcd = _XlcCurrentLC(); - + if (lcd == NULL) return; @@ -486,13 +486,13 @@ XwcFreeStringList( } const char * -XDefaultString() +XDefaultString(void) { XLCd lcd = _XlcCurrentLC(); - + if (lcd == NULL) return (char *) NULL; - + return (*lcd->methods->default_string)(lcd); } @@ -553,7 +553,7 @@ _XlcCountVaList( for (count = 0; va_arg(var, char *); count++) (void)va_arg(var, XPointer); - + *count_ret = count; } @@ -568,7 +568,7 @@ _XlcVaToArgList( *args_ret = args = (XlcArgList) Xmalloc(sizeof(XlcArg) * count); if (args == (XlcArgList) NULL) return; - + for ( ; count-- > 0; args++) { args->name = va_arg(var, char *); args->value = va_arg(var, XPointer); |