diff options
Diffstat (limited to 'libX11/modules/lc')
| -rw-r--r-- | libX11/modules/lc/def/lcDefConv.c | 3 | ||||
| -rw-r--r-- | libX11/modules/lc/gen/lcGenConv.c | 53 |
2 files changed, 25 insertions, 31 deletions
diff --git a/libX11/modules/lc/def/lcDefConv.c b/libX11/modules/lc/def/lcDefConv.c index 3cd5c22c9..e1f02289b 100644 --- a/libX11/modules/lc/def/lcDefConv.c +++ b/libX11/modules/lc/def/lcDefConv.c @@ -563,9 +563,8 @@ static void close_converter( XlcConv conv) { - if (conv->state) - Xfree(conv->state); + Xfree(conv->state); Xfree(conv); } diff --git a/libX11/modules/lc/gen/lcGenConv.c b/libX11/modules/lc/gen/lcGenConv.c index 1f7c301f5..eede76807 100644 --- a/libX11/modules/lc/gen/lcGenConv.c +++ b/libX11/modules/lc/gen/lcGenConv.c @@ -753,7 +753,7 @@ mbstowcs_org( CodeSet codeset = NULL; - const char *inbufptr = *from; + const char *inbufptr; wchar_t *outbufptr = (wchar_t *) *to; int from_size = *from_left; @@ -764,6 +764,8 @@ mbstowcs_org( return( 0 ); } + inbufptr = *from; + while (*from_left && *to_left) { ch = *inbufptr++; @@ -1223,8 +1225,7 @@ stdc_wcstocts( goto ret; ret: - if (buf) - Xfree(buf); + Xfree(buf); return (unconv_num1 + unconv_num2); } @@ -1252,7 +1253,7 @@ ctstowcs( CodeSet codeset = NULL; XlcCharSet charset_tmp; - const char *inbufptr = *from; + const char *inbufptr; wchar_t *outbufptr = (wchar_t *) *to; int from_size = *from_left; @@ -1262,6 +1263,7 @@ ctstowcs( _XlcResetConverter(conv); return( 0 ); } + inbufptr = *from; while (*from_left && *to_left) { @@ -1437,7 +1439,7 @@ cstowcs( CodeSet codeset = NULL; XlcCharSet charset, charset_tmp; - const char *inbufptr = *from; + const char *inbufptr; wchar_t *outbufptr = (wchar_t *) *to; int from_size = *from_left; @@ -1445,6 +1447,8 @@ cstowcs( return( 0 ); } + inbufptr = *from; + charset = (XlcCharSet) args[0]; while (*from_left && *to_left) { @@ -1543,8 +1547,7 @@ stdc_ctstowcs( goto ret; ret: - if (buf) - Xfree(buf); + Xfree(buf); return (unconv_num1 + unconv_num2); } @@ -1579,8 +1582,7 @@ stdc_cstowcs( goto ret; ret: - if (buf) - Xfree(buf); + Xfree(buf); return (unconv_num1 + unconv_num2); } @@ -1615,8 +1617,7 @@ mbstocts( goto ret; ret: - if (buf) - Xfree(buf); + Xfree(buf); return (unconv_num1 + unconv_num2); } @@ -1643,7 +1644,7 @@ mbstostr( CodeSet codeset = NULL; - const char *inbufptr = *from; + const char *inbufptr; char *outbufptr = *to; int from_size = *from_left; @@ -1654,6 +1655,8 @@ mbstostr( return( 0 ); } + inbufptr = *from; + while (*from_left && *to_left) { ch = *inbufptr++; @@ -1758,7 +1761,7 @@ mbtocs( CodeSet codeset = NULL; XlcCharSet charset = NULL; - const char *inbufptr = *from; + const char *inbufptr; char *outbufptr = *to; int from_size = *from_left; @@ -1769,6 +1772,8 @@ mbtocs( return( 0 ); } + inbufptr = *from; + while (*from_left && *to_left) { ch = *inbufptr++; @@ -2062,8 +2067,7 @@ stdc_wcstostr( goto ret; ret: - if (buf) - Xfree(buf); + Xfree(buf); return (unconv_num1 + unconv_num2); } @@ -2337,8 +2341,7 @@ ctstombs( goto ret; ret: - if (buf) - Xfree(buf); + Xfree(buf); return (unconv_num1 + unconv_num2); } @@ -2373,8 +2376,7 @@ cstombs( goto ret; ret: - if (buf) - Xfree(buf); + Xfree(buf); return (unconv_num1 + unconv_num2); } @@ -2582,8 +2584,7 @@ stdc_strtowcs( goto ret; ret: - if (buf) - Xfree(buf); + Xfree(buf); return (unconv_num1 + unconv_num2); } @@ -2596,14 +2597,8 @@ static void close_converter( XlcConv conv) { - if (conv->state) { - Xfree(conv->state); - } - - if (conv->methods) { - Xfree(conv->methods); - } - + Xfree(conv->state); + Xfree(conv->methods); Xfree(conv); } |