diff options
| author | Stefan Kangas | 2024-01-10 08:18:22 +0100 |
|---|---|---|
| committer | Stefan Kangas | 2024-01-10 14:48:00 +0100 |
| commit | 1a2fa8f413ffacc2490f4c46b3bbfc37b16fbd04 (patch) | |
| tree | f0868b829ce2be1e5fe609a4e86f045097bd3766 /src | |
| parent | 83ee584052f063cc802fca427c42ece2d5091ca5 (diff) | |
| download | emacs-1a2fa8f413ffacc2490f4c46b3bbfc37b16fbd04.tar.gz emacs-1a2fa8f413ffacc2490f4c46b3bbfc37b16fbd04.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/msdos.c | 12 | ||||
| -rw-r--r-- | src/pgtkterm.c | 4 | ||||
| -rw-r--r-- | src/w16select.c | 2 | ||||
| -rw-r--r-- | src/w32term.c | 2 | ||||
| -rw-r--r-- | src/w32uniscribe.c | 3 |
5 files changed, 8 insertions, 15 deletions
diff --git a/src/msdos.c b/src/msdos.c index bdacda50975..1f82d4029d7 100644 --- a/src/msdos.c +++ b/src/msdos.c | |||
| @@ -2811,14 +2811,10 @@ IT_menu_make_room (XMenu *menu) | |||
| 2811 | else if (menu->allocated == menu->count) | 2811 | else if (menu->allocated == menu->count) |
| 2812 | { | 2812 | { |
| 2813 | int count = menu->allocated = menu->allocated + 10; | 2813 | int count = menu->allocated = menu->allocated + 10; |
| 2814 | menu->text | 2814 | menu->text = xrealloc (menu->text, count * sizeof (char *)); |
| 2815 | = (char **) xrealloc (menu->text, count * sizeof (char *)); | 2815 | menu->submenu = xrealloc (menu->submenu, count * sizeof (XMenu *)); |
| 2816 | menu->submenu | 2816 | menu->panenumber = xrealloc (menu->panenumber, count * sizeof (int)); |
| 2817 | = (XMenu **) xrealloc (menu->submenu, count * sizeof (XMenu *)); | 2817 | menu->help_text = xrealloc (menu->help_text, count * sizeof (char *)); |
| 2818 | menu->panenumber | ||
| 2819 | = (int *) xrealloc (menu->panenumber, count * sizeof (int)); | ||
| 2820 | menu->help_text | ||
| 2821 | = (const char **) xrealloc (menu->help_text, count * sizeof (char *)); | ||
| 2822 | } | 2818 | } |
| 2823 | } | 2819 | } |
| 2824 | 2820 | ||
diff --git a/src/pgtkterm.c b/src/pgtkterm.c index d938427c75a..2f7a390d22d 100644 --- 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) | |||
| 3471 | i = max_fringe_bmp; | 3471 | i = max_fringe_bmp; |
| 3472 | max_fringe_bmp = which + 20; | 3472 | max_fringe_bmp = which + 20; |
| 3473 | fringe_bmp | 3473 | fringe_bmp |
| 3474 | = (cairo_pattern_t **) xrealloc (fringe_bmp, | 3474 | = xrealloc (fringe_bmp, max_fringe_bmp * sizeof (cairo_pattern_t *)); |
| 3475 | max_fringe_bmp * | ||
| 3476 | sizeof (cairo_pattern_t *)); | ||
| 3477 | while (i < max_fringe_bmp) | 3475 | while (i < max_fringe_bmp) |
| 3478 | fringe_bmp[i++] = 0; | 3476 | fringe_bmp[i++] = 0; |
| 3479 | } | 3477 | } |
diff --git a/src/w16select.c b/src/w16select.c index c8b91bfa883..ed450c665ff 100644 --- a/src/w16select.c +++ b/src/w16select.c | |||
| @@ -275,7 +275,7 @@ set_clipboard_data (unsigned Format, void *Data, unsigned Size, int Raw) | |||
| 275 | { | 275 | { |
| 276 | clipboard_storage_size = truelen + 100; | 276 | clipboard_storage_size = truelen + 100; |
| 277 | last_clipboard_text = | 277 | last_clipboard_text = |
| 278 | (char *) xrealloc (last_clipboard_text, clipboard_storage_size); | 278 | xrealloc (last_clipboard_text, clipboard_storage_size); |
| 279 | } | 279 | } |
| 280 | if (last_clipboard_text) | 280 | if (last_clipboard_text) |
| 281 | dosmemget (xbuf_addr, truelen, last_clipboard_text); | 281 | dosmemget (xbuf_addr, truelen, last_clipboard_text); |
diff --git a/src/w32term.c b/src/w32term.c index 816584a13be..f5611772637 100644 --- 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) | |||
| 949 | { | 949 | { |
| 950 | int i = max_fringe_bmp; | 950 | int i = max_fringe_bmp; |
| 951 | max_fringe_bmp = which + 20; | 951 | max_fringe_bmp = which + 20; |
| 952 | fringe_bmp = (HBITMAP *) xrealloc (fringe_bmp, max_fringe_bmp * sizeof (HBITMAP)); | 952 | fringe_bmp = xrealloc (fringe_bmp, max_fringe_bmp * sizeof (HBITMAP)); |
| 953 | while (i < max_fringe_bmp) | 953 | while (i < max_fringe_bmp) |
| 954 | fringe_bmp[i++] = 0; | 954 | fringe_bmp[i++] = 0; |
| 955 | } | 955 | } |
diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c index a73c0de06f9..84d0d95b2ab 100644 --- a/src/w32uniscribe.c +++ b/src/w32uniscribe.c | |||
| @@ -330,8 +330,7 @@ uniscribe_shape (Lisp_Object lgstring, Lisp_Object direction) | |||
| 330 | { | 330 | { |
| 331 | /* If that wasn't enough, keep trying with one more run. */ | 331 | /* If that wasn't enough, keep trying with one more run. */ |
| 332 | max_items++; | 332 | max_items++; |
| 333 | items = (SCRIPT_ITEM *) xrealloc (items, | 333 | items = xrealloc (items, sizeof (SCRIPT_ITEM) * max_items + 1); |
| 334 | sizeof (SCRIPT_ITEM) * max_items + 1); | ||
| 335 | } | 334 | } |
| 336 | 335 | ||
| 337 | if (FAILED (result)) | 336 | if (FAILED (result)) |