Remove redundant casts from void* with malloc functions

* src/msdos.c (IT_menu_make_room):
* src/pgtkterm.c (pgtk_define_fringe_bitmap):
* src/w16select.c (set_clipboard_data):
* src/w32term.c (w32_define_fringe_bitmap):
* src/w32uniscribe.c (uniscribe_shape): Remove redundant cast from
void* with xrealloc.
* admin/coccinelle/alloc_cast.cocci: New semantic patch.

diff --git a/admin/coccinelle/alloc_cast.cocci b/admin/coccinelle/alloc_cast.cocci
new file mode 100644 (file)
index 0000000..91810db
--- /dev/null
+++ b/admin/coccinelle/alloc_cast.cocci
@@ -0,0 +1,6 @@
+// Remove redundant casts from memory allocation functions.
+@@
+type T;
+@@
+-(T *)
+ \(xmalloc\|xzalloc\|xrealloc\|xpalloc\|xnrealloc\)(...)

diff --git a/src/msdos.c b/src/msdos.c
index bdacda50975c6fcda17c80516dea6557e6d60cfa..1f82d4029d7006c83367135a31896096acb6c252 100644 (file)
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -2811,14 +2811,10 @@ IT_menu_make_room (XMenu *menu)
   else if (menu->allocated == menu->count)
     {
       int count = menu->allocated = menu->allocated + 10;
-      menu->text
-       = (char **) xrealloc (menu->text, count * sizeof (char *));
-      menu->submenu
-       = (XMenu **) xrealloc (menu->submenu, count * sizeof (XMenu *));
-      menu->panenumber
-       = (int *) xrealloc (menu->panenumber, count * sizeof (int));
-      menu->help_text
-       = (const char **) xrealloc (menu->help_text, count * sizeof (char *));
+      menu->text = xrealloc (menu->text, count * sizeof (char *));
+      menu->submenu = xrealloc (menu->submenu, count * sizeof (XMenu *));
+      menu->panenumber = xrealloc (menu->panenumber, count * sizeof (int));
+      menu->help_text = xrealloc (menu->help_text, count * sizeof (char *));
     }
 }
 

diff --git a/src/pgtkterm.c b/src/pgtkterm.c
index d938427c75a052e9f46699327bd6a2a069042128..2f7a390d22d82326f498cb9c9582723c9234edce 100644 (file)
--- a/src/pgtkterm.c
+++ b/src/pgtkterm.c
@@ -3471,9 +3471,7 @@ pgtk_define_fringe_bitmap (int which, unsigned short *bits, int h, int wd)
       i = max_fringe_bmp;
       max_fringe_bmp = which + 20;
       fringe_bmp
-       = (cairo_pattern_t **) xrealloc (fringe_bmp,
-                                        max_fringe_bmp *
-                                        sizeof (cairo_pattern_t *));
+       = xrealloc (fringe_bmp, max_fringe_bmp * sizeof (cairo_pattern_t *));
       while (i < max_fringe_bmp)
        fringe_bmp[i++] = 0;
     }

diff --git a/src/w16select.c b/src/w16select.c
index c8b91bfa883dcd6aab48259721692634be172346..ed450c665fff34f68dafe53885c8a91f302a4ad4 100644 (file)
--- a/src/w16select.c
+++ b/src/w16select.c
@@ -275,7 +275,7 @@ set_clipboard_data (unsigned Format, void *Data, unsigned Size, int Raw)
     {
       clipboard_storage_size = truelen + 100;
       last_clipboard_text =
-       (char *) xrealloc (last_clipboard_text, clipboard_storage_size);
+       xrealloc (last_clipboard_text, clipboard_storage_size);
     }
   if (last_clipboard_text)
     dosmemget (xbuf_addr, truelen, last_clipboard_text);

diff --git a/src/w32term.c b/src/w32term.c
index 816584a13be95f7f44e4a135184a0c9cd2e5246d..f561177263753b02a387fae6a6f590dbe86cbf44 100644 (file)
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -949,7 +949,7 @@ w32_define_fringe_bitmap (int which, unsigned short *bits, int h, int wd)
     {
       int i = max_fringe_bmp;
       max_fringe_bmp = which + 20;
-      fringe_bmp = (HBITMAP *) xrealloc (fringe_bmp, max_fringe_bmp * sizeof (HBITMAP));
+      fringe_bmp = xrealloc (fringe_bmp, max_fringe_bmp * sizeof (HBITMAP));
       while (i < max_fringe_bmp)
        fringe_bmp[i++] = 0;
     }

diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c
index a73c0de06f9c2f15e54a4ff525c6c4dde71dc0ec..84d0d95b2ab0d85496c77880b6728ad3a8937f11 100644 (file)
--- a/src/w32uniscribe.c
+++ b/src/w32uniscribe.c
@@ -330,8 +330,7 @@ uniscribe_shape (Lisp_Object lgstring, Lisp_Object direction)
     {
       /* If that wasn't enough, keep trying with one more run.  */
       max_items++;
-      items = (SCRIPT_ITEM *) xrealloc (items,
-                                       sizeof (SCRIPT_ITEM) * max_items + 1);
+      items = xrealloc (items, sizeof (SCRIPT_ITEM) * max_items + 1);
     }
 
   if (FAILED (result))