More xmalloc and related cleanup.

* alloc.c, bidi.c, buffer.c, buffer.h, bytecode.c, callint.c:
* callproc.c, charset.c, coding.c, composite.c, data.c, dispnew.c:
* doc.c, editfns.c, emacs.c, eval.c, fileio.c, filelock.c, fns.c:
* font.c, fontset.c, frame.c, fringe.c, ftfont.c, ftxfont.c, gmalloc.c:
* gtkutil.c, image.c, keyboard.c, keymap.c, lread.c, macros.c, menu.c:
* nsfns.m, nsfont.m, nsmenu.m, nsterm.m, print.c, process.c, ralloc.c:
* regex.c, region-cache.c, scroll.c, search.c, sound.c, syntax.c:
* sysdep.c, term.c, termcap.c, unexmacosx.c, window.c, xdisp.c:
* xfaces.c, xfns.c, xftfont.c, xgselect.c, xmenu.c, xrdb.c, xselect.c:
* xterm.c:
Omit needless casts involving void * pointers and allocation.
Prefer "P = xmalloc (sizeof *P)" to "P = xmalloc (sizeof (TYPE_OF_P))",
as the former is more robust if P's type is changed.
Prefer xzalloc to xmalloc + memset 0.
Simplify malloc-or-realloc to realloc.
Don't worry about xmalloc returning a null pointer.
Prefer xstrdup to xmalloc + strcpy.
* editfns.c (Fmessage_box): Grow message_text by at least 80 when
growing it.
* keyboard.c (apply_modifiers_uncached): Prefer local array to
alloca of a constant.

1 files changed, 6 insertions, 9 deletions

diff --git a/src/fringe.c b/src/fringe.c
index cd3b87b43d4..4ab9c770326 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -1616,12 +1616,10 @@ If BITMAP already exists, the existing definition is replaced.  */)
                 error ("No free fringe bitmap slots");
 
               i = max_fringe_bitmaps;
-              fringe_bitmaps
-                = ((struct fringe_bitmap **)
-                   xrealloc (fringe_bitmaps, bitmaps * sizeof *fringe_bitmaps));
-              fringe_faces
-                = (Lisp_Object *) xrealloc (fringe_faces,
-                                            bitmaps * sizeof *fringe_faces);
+              fringe_bitmaps = xrealloc (fringe_bitmaps,
+                                         bitmaps * sizeof *fringe_bitmaps);
+              fringe_faces = xrealloc (fringe_faces,
+                                       bitmaps * sizeof *fringe_faces);
 
               for (i = max_fringe_bitmaps; i < bitmaps; i++)
                 {
@@ -1803,9 +1801,8 @@ init_fringe (void)
 
   max_fringe_bitmaps = MAX_STANDARD_FRINGE_BITMAPS + 20;
 
-  fringe_bitmaps
-    = xzalloc (max_fringe_bitmaps * sizeof (struct fringe_bitmap *));
-  fringe_faces = xmalloc (max_fringe_bitmaps * sizeof (Lisp_Object));
+  fringe_bitmaps = xzalloc (max_fringe_bitmaps * sizeof *fringe_bitmaps);
+  fringe_faces = xmalloc (max_fringe_bitmaps * sizeof *fringe_faces);
 
   for (i = 0; i < max_fringe_bitmaps; i++)
     fringe_faces[i] = Qnil;