aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib/X11/lcEuc.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-10-12 08:32:04 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-10-12 08:32:04 +0200
commit051d521f6e20761ba6831cecd91883da960fa931 (patch)
treeb28abba7818115d2fed80eb360a79a0f9183948e /nx-X11/lib/X11/lcEuc.c
parent6dce607bad8711dd06a5a7b69ad1930386b4123b (diff)
parentb8de7bf654929c823080b211aeac56cd213f5a32 (diff)
downloadnx-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/lcEuc.c')
-rw-r--r--nx-X11/lib/X11/lcEuc.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/nx-X11/lib/X11/lcEuc.c b/nx-X11/lib/X11/lcEuc.c
index 3e8b77c88..442e3090f 100644
--- a/nx-X11/lib/X11/lcEuc.c
+++ b/nx-X11/lib/X11/lcEuc.c
@@ -62,7 +62,7 @@ OF THIS SOFTWARE.
#define KANJI_CODESET 1
#define KANA_CODESET 2
#define USERDEF_CODESET 3
-#define MAX_CODESETS
+#define MAX_CODESETS
#define GR 0x80 /* begins right-side (non-ascii) region */
#define GL 0x7f /* ends left-side (ascii) region */
@@ -123,7 +123,7 @@ euc_mbstowcs(
const char *inbufptr = *from;
wchar_t *outbufptr = (wchar_t *) *to;
- CodeSet *codesets = XLC_GENERIC(lcd, codeset_list);
+ CodeSet *codesets = XLC_GENERIC(lcd, codeset_list);
int codeset_num = XLC_GENERIC(lcd, codeset_num);
Ulong wc_shift = XLC_GENERIC(lcd, wc_shift_bits);
@@ -213,7 +213,7 @@ euc_mbstowcs(
chrcode <<= (wc_shift * shift_mult);
shift_mult--;
- wc_tmp |= chrcode;
+ wc_tmp |= chrcode;
if (--chr_len == 0) {
wc_tmp |= wc_encode;
@@ -438,11 +438,11 @@ euc_mbstocs(
*from_left = tmp_from_left;
*to = (XPointer) tmp_to;
*to_left = tmp_to_left;
- }
+ }
if (num_args > 0)
*((XlcCharSet *) args[0]) = charset;
-
+
return unconv_num;
}
@@ -528,7 +528,7 @@ euc_cstombs(
if (num_args < 1)
return -1;
-
+
if (!(codeset = GetCodeSetFromCharSet(lcd, (XlcCharSet) args[0])))
return -1;
@@ -586,10 +586,10 @@ euc_cstowcs(
int length;
Ulong wc_shift_bits = XLC_GENERIC(lcd, wc_shift_bits);
CodeSet codeset;
-
+
if (num_args < 1)
return -1;
-
+
if (!(codeset = GetCodeSetFromCharSet(lcd, (XlcCharSet) args[0])))
return -1;
@@ -602,7 +602,7 @@ euc_cstowcs(
toptr += buf_len;
*to = (XPointer) toptr;
-
+
while (buf_len--) {
wch = (wchar_t) BIT8OFF(*csptr);
@@ -674,7 +674,7 @@ create_conv(
conv = (XlcConv) Xmalloc(sizeof(XlcConvRec));
if (conv == NULL)
return (XlcConv) NULL;
-
+
conv->methods = methods;
conv->state = (XPointer) lcd;
return conv;
@@ -1068,7 +1068,7 @@ euc_wcstocts(
}
- } while (length);
+ } while (length);
} /* end for */
@@ -1327,7 +1327,7 @@ euc_mbstocts(
unconv_num++;
break;
}
-
+
if (ctptr) {
strcpy(ctptr, ctdptr[cs_num]->ct_encoding);
ctptr += ctdptr[cs_num]->ct_encoding_len;
@@ -1347,7 +1347,7 @@ euc_mbstocts(
do {
*ctptr++ = charset == ct_state.GR_charset ?
BIT8ON(*inbufptr++) : BIT8OFF(*inbufptr++);
- } while (--clen);
+ } while (--clen);
}
*to = (XPointer)ctptr;