diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2023-04-27 14:10:57 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2023-04-27 14:10:57 +0200 |
commit | 91d9218c0cc659f40918af6ac6c035c6c48d2c6d (patch) | |
tree | 79054df1730d4723658b02cec311bc8ba7655662 /nx-X11/lib/src/xlibi18n/lcTxtPr.c | |
parent | a502149a844736dcc7f7dedd7c63229c74a448ee (diff) | |
parent | 4875a15ca61358a1c95b156b2279fce092451278 (diff) | |
download | nx-libs-91d9218c0cc659f40918af6ac6c035c6c48d2c6d.tar.gz nx-libs-91d9218c0cc659f40918af6ac6c035c6c48d2c6d.tar.bz2 nx-libs-91d9218c0cc659f40918af6ac6c035c6c48d2c6d.zip |
Merge branch 'uli42-pr/update_libX11_2022' into 3.6.x
Attributes GH PR #1037: https://github.com/ArcticaProject/nx-libs/pull/1037
Diffstat (limited to 'nx-X11/lib/src/xlibi18n/lcTxtPr.c')
-rw-r--r-- | nx-X11/lib/src/xlibi18n/lcTxtPr.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nx-X11/lib/src/xlibi18n/lcTxtPr.c b/nx-X11/lib/src/xlibi18n/lcTxtPr.c index cf25e3d0e..102d2917b 100644 --- a/nx-X11/lib/src/xlibi18n/lcTxtPr.c +++ b/nx-X11/lib/src/xlibi18n/lcTxtPr.c @@ -56,7 +56,7 @@ get_buf_size( mb_list = (char **) list; for ( ; count-- > 0; mb_list++) { if (*mb_list) - length += strlen(*mb_list) + 1; + length = (int) ((size_t) length + (strlen(*mb_list) + 1)); } length *= 3; /* XXX */ } @@ -118,7 +118,7 @@ _XTextListToTextProperty( strcpy(to, *mb_list); else *to = '\0'; - from_left = (*mb_list ? strlen(*mb_list) : 0) + 1; + from_left = (int) (*mb_list ? strlen(*mb_list) : 0) + 1; nitems += from_left; to += from_left; mb_list++; @@ -161,7 +161,7 @@ retry: wc_list++; } else { from = (XPointer) *mb_list; - from_left = (*mb_list ? strlen(*mb_list) : 0); + from_left = (int) (*mb_list ? strlen(*mb_list) : 0); mb_list++; } @@ -190,7 +190,7 @@ retry: _XlcCloseConverter(conv); - nitems = to - buf; + nitems = (int) (to - buf); done: if (nitems <= 0) nitems = 1; @@ -202,14 +202,14 @@ done: if (nitems == 1) *value = 0; else - memcpy(value, buf, nitems); + memcpy(value, buf, (size_t) nitems); nitems--; Xfree(buf); text_prop->value = (unsigned char *) value; text_prop->encoding = encoding; text_prop->format = 8; - text_prop->nitems = nitems; + text_prop->nitems = (unsigned long) nitems; return unconv_num; } |