Merge branch 'uli42-pr/libX11_further_backports' into 3.6.x

Attributes GH PR #222: https://github.com/ArcticaProject/nx-libs/pull/222

3 files changed, 11 insertions, 10 deletions

diff --git a/nx-X11/lib/X11/lcUniConv/8bit_tab_to_h.c b/nx-X11/lib/X11/lcUniConv/8bit_tab_to_h.c
index 1caa28a21..993979aeb 100644
--- a/nx-X11/lib/X11/lcUniConv/8bit_tab_to_h.c
+++ b/nx-X11/lib/X11/lcUniConv/8bit_tab_to_h.c
@@ -65,7 +65,7 @@ int main (int argc, char *argv[])
   if (argc > 3) {
     filename = argv[3];
   } else {
-    char* s = (char*) malloc(strlen(c_charsetname)+strlen(".h")+1);
+    char* s = malloc(strlen(c_charsetname)+strlen(".h")+1);
     strcpy(s,c_charsetname); strcat(s,".h");
     filename = s;
   }
@@ -361,11 +361,11 @@ int main (int argc, char *argv[])
         if (tables[t].usecount > 1) {
           char* s;
           if (p == tables[t].minline >> 5) {
-            s = (char*) malloc(5+1);
+            s = malloc(5+1);
             sprintf(s, "%02x_%d", p, ++i);
           } else {
             p = tables[t].minline >> 5;
-            s = (char*) malloc(2+1);
+            s = malloc(2+1);
             sprintf(s, "%02x", p);
           }
           tables[t].suffix = s;
diff --git a/nx-X11/lib/X11/lcUniConv/big5hkscs.h b/nx-X11/lib/X11/lcUniConv/big5hkscs.h
index 29eab938f..721d1228e 100644
--- a/nx-X11/lib/X11/lcUniConv/big5hkscs.h
+++ b/nx-X11/lib/X11/lcUniConv/big5hkscs.h
@@ -6249,3 +6249,4 @@ big5hkscs_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n)
   }
   return RET_TOOSMALL;
 }
+
diff --git a/nx-X11/lib/X11/lcUniConv/cjk_tab_to_h.c b/nx-X11/lib/X11/lcUniConv/cjk_tab_to_h.c
index 6934789cf..f70fe5e11 100644
--- a/nx-X11/lib/X11/lcUniConv/cjk_tab_to_h.c
+++ b/nx-X11/lib/X11/lcUniConv/cjk_tab_to_h.c
@@ -70,9 +70,9 @@ static void read_table (Encoding* enc)
 {
   int row, col, i, i1, i2, c, j;
 
-  enc->charset2uni = (int**) malloc(enc->rows*sizeof(int*));
+  enc->charset2uni = malloc(enc->rows*sizeof(int*));
   for (row = 0; row < enc->rows; row++)
-    enc->charset2uni[row] = (int*) malloc(enc->cols*sizeof(int));
+    enc->charset2uni[row] = malloc(enc->cols*sizeof(int));
 
   for (row = 0; row < enc->rows; row++)
     for (col = 0; col < enc->cols; col++)
@@ -136,7 +136,7 @@ static void find_charset2uni_pages (Encoding* enc)
 {
   int row, col;
 
-  enc->charsetpage = (int*) malloc((enc->rows+1)*sizeof(int));
+  enc->charsetpage = malloc((enc->rows+1)*sizeof(int));
 
   for (row = 0; row <= enc->rows; row++)
     enc->charsetpage[row] = 0;
@@ -157,7 +157,7 @@ static void find_charset2uni_blocks (Encoding* enc)
 {
   int n, row, lastrow;
 
-  enc->charsetblocks = (Block*) malloc(enc->rows*sizeof(Block));
+  enc->charsetblocks = malloc(enc->rows*sizeof(Block));
 
   n = 0;
   for (row = 0; row < enc->rows; row++)
@@ -266,7 +266,7 @@ static void invert (Encoding* enc)
 {
   int row, col, j;
 
-  enc->uni2charset = (int*) malloc(0x10000*sizeof(int));
+  enc->uni2charset = malloc(0x10000*sizeof(int));
 
   for (j = 0; j < 0x10000; j++)
     enc->uni2charset[j] = 0;
@@ -764,9 +764,9 @@ static void read_table_ksc5601 (Encoding* enc)
 {
   int row, col, i, i1, i2, c, j;
 
-  enc->charset2uni = (int**) malloc(enc->rows*sizeof(int*));
+  enc->charset2uni = malloc(enc->rows*sizeof(int*));
   for (row = 0; row < enc->rows; row++)
-    enc->charset2uni[row] = (int*) malloc(enc->cols*sizeof(int));
+    enc->charset2uni[row] = malloc(enc->cols*sizeof(int));
 
   for (row = 0; row < enc->rows; row++)
     for (col = 0; col < enc->cols; col++)