diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2022-01-19 00:45:43 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2023-04-27 14:08:46 +0200 |
| commit | 4875a15ca61358a1c95b156b2279fce092451278 (patch) | |
| tree | 79054df1730d4723658b02cec311bc8ba7655662 /nx-X11/lib/src/xlibi18n/lcCT.c | |
| parent | a502149a844736dcc7f7dedd7c63229c74a448ee (diff) | |
| download | nx-libs-4875a15ca61358a1c95b156b2279fce092451278.tar.gz nx-libs-4875a15ca61358a1c95b156b2279fce092451278.tar.bz2 nx-libs-4875a15ca61358a1c95b156b2279fce092451278.zip | |
Update libNX_X11 to upstream's libX11-1.7.3.1-10-gd60ede78
Diffstat (limited to 'nx-X11/lib/src/xlibi18n/lcCT.c')
| -rw-r--r-- | nx-X11/lib/src/xlibi18n/lcCT.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/nx-X11/lib/src/xlibi18n/lcCT.c b/nx-X11/lib/src/xlibi18n/lcCT.c index a2ff93c8a..15e4ef233 100644 --- a/nx-X11/lib/src/xlibi18n/lcCT.c +++ b/nx-X11/lib/src/xlibi18n/lcCT.c @@ -323,7 +323,7 @@ _XlcParseCharSet( if (*ptr == '\0') return False; - length = strlen(ptr); + length = (int) strlen(ptr); type = _XlcParseCT(&ptr, &length, &final_byte); @@ -428,7 +428,7 @@ _XlcGetCTInfo( && (type != XctExtSeg || (text_len >= ct_info->ext_segment_len && memcmp(text, ct_info->ext_segment, - ct_info->ext_segment_len) == 0))) + (size_t) ct_info->ext_segment_len) == 0))) return ct_info; return (CTInfo) NULL; @@ -477,7 +477,7 @@ _XlcAddCT( } /* Allocate a CTinfo record. */ - length = strlen(ct_sequence); + length = (int) strlen(ct_sequence); ct_info = Xmalloc(sizeof(CTInfoRec) + length+1); if (ct_info == NULL) return charset; @@ -506,7 +506,7 @@ _XlcAddCT( /* By convention, the extended segment name is the encoding_name in lowercase. */ const char *q = charset->encoding_name; - int n = strlen(q); + int n = (int) strlen(q); char *p; /* Ensure ct_info->ext_segment_len <= 0x3fff - 6. */ @@ -802,7 +802,7 @@ cttocs( int n = (state->ext_seg_left <= buf_len ? state->ext_seg_left : (buf_len / char_size) * char_size); - memcpy(bufptr, ctptr, n); + memcpy(bufptr, ctptr, (size_t) n); ctptr += n; ctext_len -= n; bufptr += n; buf_len -= n; state->ext_seg_left -= n; @@ -834,7 +834,7 @@ cttocs( We may be splitting a character into multiple pieces. Oh well. */ int n = buf_len; - memcpy(bufptr, ctptr, n); + memcpy(bufptr, ctptr, (size_t) n); ctptr += n; ctext_len -= n; bufptr += n; buf_len -= n; state->ext_seg_left -= n; @@ -899,7 +899,7 @@ cstoct( return -1; side = charset->side; - length = strlen(ct_info->ct_sequence); + length = (int) strlen(ct_info->ct_sequence); ext_segment_start = NULL; @@ -909,7 +909,7 @@ cstoct( if (ct_len < length + 3) return -1; - memcpy(ctptr, ct_info->ct_sequence, length); + memcpy(ctptr, ct_info->ct_sequence, (size_t) length); ctptr += length; ct_len -= length + 3; } else @@ -924,7 +924,7 @@ cstoct( if (ct_len < length + 2 + ct_info->ext_segment_len) return -1; - memcpy(ctptr, ct_info->ct_sequence, length); + memcpy(ctptr, ct_info->ct_sequence, (size_t) length); ctptr += length; ct_len -= length; @@ -936,14 +936,14 @@ cstoct( if (ct_len > 0x3fff) ct_len = 0x3fff; - memcpy(ctptr, ct_info->ext_segment, ct_info->ext_segment_len); + memcpy(ctptr, ct_info->ext_segment, (size_t) ct_info->ext_segment_len); ctptr += ct_info->ext_segment_len; ct_len -= ct_info->ext_segment_len; } else { if (ct_len < length) return -1; - memcpy(ctptr, ct_info->ct_sequence, length); + memcpy(ctptr, ct_info->ct_sequence, (size_t) length); ctptr += length; ct_len -= length; } |