Commit 7d652d97 authored by Paul Eggert's avatar Paul Eggert
Browse files

Omit some unnecessary casts.

Many of these go back to the old pre-C89 days, when they may have
been needed, but we've been assuming C89 or later for a while now.
* alloc.c (live_string_p, live_cons_p, live_symbol_p)
(live_float_p, live_misc_p, live_vector_p):
* buffer.c (compare_overlays, cmp_for_strings, mmap_find)
(mmap_alloc, alloc_buffer_text, enlarge_buffer_text)
(defvar_per_buffer):
* callint.c (Fcall_interactively):
* doc.c (Fsubstitute_command_keys):
* filelock.c (get_boot_time):
* frame.c (xrdb_get_resource):
* gtkutil.c (hierarchy_ch_cb, qttip_cb, style_changed_cb)
(delete_cb, xg_dialog_response_cb, xg_maybe_add_timer)
(xg_get_file_name_from_selector, menuitem_destroy_callback)
(menuitem_highlight_callback, menu_destroy_callback)
(xg_update_menu_item, xg_modify_menubar_widgets, menubar_map_cb)
(xg_tool_bar_callback, xg_get_tool_bar_widgets)
(xg_tool_bar_detach_callback, xg_tool_bar_attach_callback)
(xg_tool_bar_help_callback, tb_size_cb):
* image.c (xpm_alloc_color, png_read_from_memory)
(png_read_from_file, png_load_body, our_memory_skip_input_data)
(jpeg_memory_src, jpeg_file_src, imagemagick_load_image)
(syms_of_image):
* keymap.c (describe_map):
* nsfns.m (Fns_display_monitor_attributes_list):
* nsmenu.m (process_dialog:):
* nsterm.m (hold_event):
* process.c (wait_reading_process_output):
* regex.c (REGEX_REALLOCATE, re_set_registers, re_exec, regexec):
* scroll.c (do_direct_scrolling, scrolling_1):
* termcap.c (tgetent):
* window.c (check_window_containing, add_window_to_list)
(freeze_window_starts):
* xdisp.c (compare_overlay_entries, vmessage):
* xfns.c (x_window, x_get_monitor_attributes_xinerama)
(x_get_monitor_attributes_xrandr)
(Fx_display_monitor_attributes_list, x_display_info_for_name)
(Fx_open_connection, file_dialog_cb, file_dialog_unmap_cb):
* xfont.c (xfont_match, xfont_open):
* xmenu.c (x_menu_wait_for_event, menu_highlight_callback)
(menubar_selection_callback, menu_position_func)
(popup_selection_callback, create_and_show_popup_menu)
(dialog_selection_callback, create_and_show_dialog):
* xrdb.c (x_get_string_resource):
(main) [TESTRM]:
* xsmfns.c (x_session_check_input):
* xterm.c (x_draw_glyphless_glyph_string_foreground)
(xm_scroll_callback, xg_scroll_callback, xg_end_scroll_callback)
(xaw_jump_callback, xaw_scroll_callback):
Omit unnecessary casts.
parent 9a4ebc74
2013-08-11 Paul Eggert <eggert@cs.ucla.edu>
Omit some unnecessary casts.
Many of these go back to the old pre-C89 days, when they may have
been needed, but we've been assuming C89 or later for a while now.
* alloc.c (live_string_p, live_cons_p, live_symbol_p)
(live_float_p, live_misc_p, live_vector_p):
* buffer.c (compare_overlays, cmp_for_strings, mmap_find)
(mmap_alloc, alloc_buffer_text, enlarge_buffer_text)
(defvar_per_buffer):
* callint.c (Fcall_interactively):
* doc.c (Fsubstitute_command_keys):
* filelock.c (get_boot_time):
* frame.c (xrdb_get_resource):
* gtkutil.c (hierarchy_ch_cb, qttip_cb, style_changed_cb)
(delete_cb, xg_dialog_response_cb, xg_maybe_add_timer)
(xg_get_file_name_from_selector, menuitem_destroy_callback)
(menuitem_highlight_callback, menu_destroy_callback)
(xg_update_menu_item, xg_modify_menubar_widgets, menubar_map_cb)
(xg_tool_bar_callback, xg_get_tool_bar_widgets)
(xg_tool_bar_detach_callback, xg_tool_bar_attach_callback)
(xg_tool_bar_help_callback, tb_size_cb):
* image.c (xpm_alloc_color, png_read_from_memory)
(png_read_from_file, png_load_body, our_memory_skip_input_data)
(jpeg_memory_src, jpeg_file_src, imagemagick_load_image)
(syms_of_image):
* keymap.c (describe_map):
* nsfns.m (Fns_display_monitor_attributes_list):
* nsmenu.m (process_dialog:):
* nsterm.m (hold_event):
* process.c (wait_reading_process_output):
* regex.c (REGEX_REALLOCATE, re_set_registers, re_exec, regexec):
* scroll.c (do_direct_scrolling, scrolling_1):
* termcap.c (tgetent):
* window.c (check_window_containing, add_window_to_list)
(freeze_window_starts):
* xdisp.c (compare_overlay_entries, vmessage):
* xfns.c (x_window, x_get_monitor_attributes_xinerama)
(x_get_monitor_attributes_xrandr)
(Fx_display_monitor_attributes_list, x_display_info_for_name)
(Fx_open_connection, file_dialog_cb, file_dialog_unmap_cb):
* xfont.c (xfont_match, xfont_open):
* xmenu.c (x_menu_wait_for_event, menu_highlight_callback)
(menubar_selection_callback, menu_position_func)
(popup_selection_callback, create_and_show_popup_menu)
(dialog_selection_callback, create_and_show_dialog):
* xrdb.c (x_get_string_resource):
(main) [TESTRM]:
* xsmfns.c (x_session_check_input):
* xterm.c (x_draw_glyphless_glyph_string_foreground)
(xm_scroll_callback, xg_scroll_callback, xg_end_scroll_callback)
(xaw_jump_callback, xaw_scroll_callback):
Omit unnecessary casts.
2013-08-10 Paul Eggert <eggert@cs.ucla.edu>
Minor string-length refactoring.
......
......@@ -4058,7 +4058,7 @@ live_string_p (struct mem_node *m, void *p)
{
if (m->type == MEM_TYPE_STRING)
{
struct string_block *b = (struct string_block *) m->start;
struct string_block *b = m->start;
ptrdiff_t offset = (char *) p - (char *) &b->strings[0];
/* P must point to the start of a Lisp_String structure, and it
......@@ -4081,7 +4081,7 @@ live_cons_p (struct mem_node *m, void *p)
{
if (m->type == MEM_TYPE_CONS)
{
struct cons_block *b = (struct cons_block *) m->start;
struct cons_block *b = m->start;
ptrdiff_t offset = (char *) p - (char *) &b->conses[0];
/* P must point to the start of a Lisp_Cons, not be
......@@ -4107,7 +4107,7 @@ live_symbol_p (struct mem_node *m, void *p)
{
if (m->type == MEM_TYPE_SYMBOL)
{
struct symbol_block *b = (struct symbol_block *) m->start;
struct symbol_block *b = m->start;
ptrdiff_t offset = (char *) p - (char *) &b->symbols[0];
/* P must point to the start of a Lisp_Symbol, not be
......@@ -4133,7 +4133,7 @@ live_float_p (struct mem_node *m, void *p)
{
if (m->type == MEM_TYPE_FLOAT)
{
struct float_block *b = (struct float_block *) m->start;
struct float_block *b = m->start;
ptrdiff_t offset = (char *) p - (char *) &b->floats[0];
/* P must point to the start of a Lisp_Float and not be
......@@ -4157,7 +4157,7 @@ live_misc_p (struct mem_node *m, void *p)
{
if (m->type == MEM_TYPE_MISC)
{
struct marker_block *b = (struct marker_block *) m->start;
struct marker_block *b = m->start;
ptrdiff_t offset = (char *) p - (char *) &b->markers[0];
/* P must point to the start of a Lisp_Misc, not be
......@@ -4184,7 +4184,7 @@ live_vector_p (struct mem_node *m, void *p)
if (m->type == MEM_TYPE_VECTOR_BLOCK)
{
/* This memory node corresponds to a vector block. */
struct vector_block *block = (struct vector_block *) m->start;
struct vector_block *block = m->start;
struct Lisp_Vector *vector = (struct Lisp_Vector *) block->data;
/* P is in the block's allocation range. Scan the block
......
......@@ -3146,8 +3146,8 @@ struct sortvec
static int
compare_overlays (const void *v1, const void *v2)
{
const struct sortvec *s1 = (const struct sortvec *) v1;
const struct sortvec *s2 = (const struct sortvec *) v2;
const struct sortvec *s1 = v1;
const struct sortvec *s2 = v2;
if (s1->priority != s2->priority)
return s1->priority < s2->priority ? -1 : 1;
if (s1->beg != s2->beg)
......@@ -3253,8 +3253,8 @@ static ptrdiff_t overlay_str_len;
static int
cmp_for_strings (const void *as1, const void *as2)
{
struct sortstr *s1 = (struct sortstr *)as1;
struct sortstr *s2 = (struct sortstr *)as2;
struct sortstr const *s1 = as1;
struct sortstr const *s2 = as2;
if (s1->size != s2->size)
return s2->size < s1->size ? -1 : 1;
if (s1->priority != s2->priority)
......@@ -4752,7 +4752,7 @@ static struct mmap_region *
mmap_find (void *start, void *end)
{
struct mmap_region *r;
char *s = (char *) start, *e = (char *) end;
char *s = start, *e = end;
for (r = mmap_regions; r; r = r->next)
{
......@@ -4911,7 +4911,7 @@ mmap_alloc (void **var, size_t nbytes)
}
else
{
struct mmap_region *r = (struct mmap_region *) p;
struct mmap_region *r = p;
r->nbytes_specified = nbytes;
r->nbytes_mapped = map;
......@@ -5051,7 +5051,7 @@ alloc_buffer_text (struct buffer *b, ptrdiff_t nbytes)
memory_full (nbytes);
}
b->text->beg = (unsigned char *) p;
b->text->beg = p;
unblock_input ();
}
......@@ -5079,7 +5079,7 @@ enlarge_buffer_text (struct buffer *b, ptrdiff_t delta)
memory_full (nbytes);
}
BUF_BEG_ADDR (b) = (unsigned char *) p;
BUF_BEG_ADDR (b) = p;
unblock_input ();
}
......@@ -5397,11 +5397,7 @@ defvar_per_buffer (struct Lisp_Buffer_Objfwd *bo_fwd, const char *namestring,
bo_fwd->predicate = predicate;
sym->declared_special = 1;
sym->redirect = SYMBOL_FORWARDED;
{
/* I tried to do the job without a cast, but it seems impossible.
union Lisp_Fwd *fwd; &(fwd->u_buffer_objfwd) = bo_fwd; */
SET_SYMBOL_FWD (sym, (union Lisp_Fwd *)bo_fwd);
}
SET_SYMBOL_FWD (sym, (union Lisp_Fwd *) bo_fwd);
XSETSYMBOL (PER_BUFFER_SYMBOL (offset), sym);
if (PER_BUFFER_IDX (offset) == 0)
......
......@@ -529,7 +529,7 @@ invoke it. If KEYS is omitted or nil, the return value of
make_number (SCHARS (callint_message)),
Qface, Qminibuffer_prompt, callint_message);
args[i] = Fread_char (callint_message, Qnil, Qnil);
message1_nolog ((char *) 0);
message1_nolog (0);
/* Passing args[i] directly stimulates compiler bug. */
teml = args[i];
/* See bug#8479. */
......
......@@ -905,7 +905,7 @@ Otherwise, return a new string, without any text properties. */)
If this one's not active, get nil. */
earlier_maps = Fcdr (Fmemq (tem, Freverse (active_maps)));
describe_map_tree (tem, 1, Fnreverse (earlier_maps),
Qnil, (char *)0, 1, 0, 0, 1);
Qnil, 0, 1, 0, 0, 1);
}
tem = Fbuffer_string ();
Ferase_buffer ();
......
......@@ -181,7 +181,7 @@ get_boot_time (void)
since utmp is typically much smaller than wtmp.
Passing a null pointer causes get_boot_time_1
to inspect the default file, namely utmp. */
get_boot_time_1 ((char *) 0, 0);
get_boot_time_1 (0, 0);
if (boot_time)
return boot_time;
......
......@@ -3544,7 +3544,7 @@ xrdb_get_resource (XrmDatabase rdb, Lisp_Object attribute, Lisp_Object class, Li
value = x_get_string_resource (rdb, name_key, class_key);
if (value != (char *) 0 && *value)
if (value && *value)
return build_string (value);
else
return Qnil;
......
......@@ -641,7 +641,7 @@ hierarchy_ch_cb (GtkWidget *widget,
GtkWidget *previous_toplevel,
gpointer user_data)
{
struct frame *f = (struct frame *) user_data;
struct frame *f = user_data;
struct x_output *x = f->output_data.x;
GtkWidget *top = gtk_widget_get_toplevel (x->ttip_lbl);
......@@ -663,7 +663,7 @@ qttip_cb (GtkWidget *widget,
GtkTooltip *tooltip,
gpointer user_data)
{
struct frame *f = (struct frame *) user_data;
struct frame *f = user_data;
struct x_output *x = f->output_data.x;
if (x->ttip_widget == NULL)
{
......@@ -1073,7 +1073,7 @@ style_changed_cb (GObject *go,
gpointer user_data)
{
struct input_event event;
GdkDisplay *gdpy = (GdkDisplay *) user_data;
GdkDisplay *gdpy = user_data;
const char *display_name = gdk_display_get_name (gdpy);
Display *dpy = GDK_DISPLAY_XDISPLAY (gdpy);
......@@ -1115,7 +1115,7 @@ delete_cb (GtkWidget *widget,
#ifdef HAVE_GTK3
/* The event doesn't arrive in the normal event loop. Send event
here. */
struct frame *f = (struct frame *) user_data;
struct frame *f = user_data;
struct input_event ie;
EVENT_INIT (ie);
......@@ -1642,7 +1642,7 @@ xg_dialog_response_cb (GtkDialog *w,
gint response,
gpointer user_data)
{
struct xg_dialog_data *dd = (struct xg_dialog_data *)user_data;
struct xg_dialog_data *dd = user_data;
dd->response = response;
g_main_loop_quit (dd->loop);
}
......@@ -1671,7 +1671,7 @@ pop_down_dialog (void *arg)
static gboolean
xg_maybe_add_timer (gpointer data)
{
struct xg_dialog_data *dd = (struct xg_dialog_data *) data;
struct xg_dialog_data *dd = data;
EMACS_TIME next_time = timer_check ();
dd->timerid = 0;
......@@ -1921,7 +1921,7 @@ static char *
xg_get_file_name_from_selector (GtkWidget *w)
{
GtkFileSelection *filesel = GTK_FILE_SELECTION (w);
return xstrdup ((char*) gtk_file_selection_get_filename (filesel));
return xstrdup (gtk_file_selection_get_filename (filesel));
}
/* Create a file selection dialog.
......@@ -2277,7 +2277,7 @@ menuitem_destroy_callback (GtkWidget *w, gpointer client_data)
{
if (client_data)
{
xg_menu_item_cb_data *data = (xg_menu_item_cb_data*) client_data;
xg_menu_item_cb_data *data = client_data;
xg_list_remove (&xg_menu_item_cb_list, &data->ptrs);
xfree (data);
}
......@@ -2301,8 +2301,7 @@ menuitem_highlight_callback (GtkWidget *w,
ev.crossing = *event;
subwidget = gtk_get_event_widget (&ev);
data = (xg_menu_item_cb_data *) g_object_get_data (G_OBJECT (subwidget),
XG_ITEM_DATA);
data = g_object_get_data (G_OBJECT (subwidget), XG_ITEM_DATA);
if (data)
{
if (! NILP (data->help) && data->cl_data->highlight_cb)
......@@ -2323,7 +2322,7 @@ menuitem_highlight_callback (GtkWidget *w,
static void
menu_destroy_callback (GtkWidget *w, gpointer client_data)
{
unref_cl_data ((xg_menu_cb_data*) client_data);
unref_cl_data (client_data);
}
/* Make a GTK widget that contains both UTF8_LABEL and UTF8_KEY (both
......@@ -3064,8 +3063,7 @@ xg_update_menu_item (widget_value *val,
else if (val->enabled && ! gtk_widget_get_sensitive (w))
gtk_widget_set_sensitive (w, TRUE);
cb_data = (xg_menu_item_cb_data*) g_object_get_data (G_OBJECT (w),
XG_ITEM_DATA);
cb_data = g_object_get_data (G_OBJECT (w), XG_ITEM_DATA);
if (cb_data)
{
cb_data->call_data = val->call_data;
......@@ -3271,8 +3269,7 @@ xg_modify_menubar_widgets (GtkWidget *menubar, struct frame *f,
if (! list) return;
cl_data = (xg_menu_cb_data*) g_object_get_data (G_OBJECT (menubar),
XG_FRAME_DATA);
cl_data = g_object_get_data (G_OBJECT (menubar), XG_FRAME_DATA);
xg_update_menubar (menubar, f, &list, list, 0, val->contents,
select_cb, deactivate_cb, highlight_cb, cl_data);
......@@ -3336,7 +3333,7 @@ static void
menubar_map_cb (GtkWidget *w, gpointer user_data)
{
GtkRequisition req;
struct frame *f = (struct frame *) user_data;
struct frame *f = user_data;
gtk_widget_get_preferred_size (w, NULL, &req);
if (FRAME_MENUBAR_HEIGHT (f) != req.height)
{
......@@ -3946,8 +3943,7 @@ xg_tool_bar_callback (GtkWidget *w, gpointer client_data)
gpointer gmod = g_object_get_data (G_OBJECT (w), XG_TOOL_BAR_LAST_MODIFIER);
intptr_t mod = (intptr_t) gmod;
struct frame *f = (struct frame *) g_object_get_data (G_OBJECT (w),
XG_FRAME_DATA);
struct frame *f = g_object_get_data (G_OBJECT (w), XG_FRAME_DATA);
Lisp_Object key, frame;
struct input_event event;
EVENT_INIT (event);
......@@ -4020,8 +4016,8 @@ static GtkWidget *
xg_get_tool_bar_widgets (GtkWidget *vb, GtkWidget **wimage)
{
GList *clist = gtk_container_get_children (GTK_CONTAINER (vb));
GtkWidget *c1 = (GtkWidget *) clist->data;
GtkWidget *c2 = clist->next ? (GtkWidget *) clist->next->data : NULL;
GtkWidget *c1 = clist->data;
GtkWidget *c2 = clist->next ? clist->next->data : NULL;
*wimage = GTK_IS_IMAGE (c1) ? c1 : c2;
g_list_free (clist);
......@@ -4150,7 +4146,7 @@ xg_tool_bar_detach_callback (GtkHandleBox *wbox,
GtkWidget *w,
gpointer client_data)
{
struct frame *f = (struct frame *) client_data;
struct frame *f = client_data;
g_object_set (G_OBJECT (w), "show-arrow", !x_gtk_whole_detached_tool_bar,
NULL);
......@@ -4187,7 +4183,7 @@ xg_tool_bar_attach_callback (GtkHandleBox *wbox,
GtkWidget *w,
gpointer client_data)
{
struct frame *f = (struct frame *) client_data;
struct frame *f = client_data;
g_object_set (G_OBJECT (w), "show-arrow", TRUE, NULL);
if (f)
......@@ -4225,8 +4221,7 @@ xg_tool_bar_help_callback (GtkWidget *w,
gpointer client_data)
{
intptr_t idx = (intptr_t) client_data;
struct frame *f = (struct frame *) g_object_get_data (G_OBJECT (w),
XG_FRAME_DATA);
struct frame *f = g_object_get_data (G_OBJECT (w), XG_FRAME_DATA);
Lisp_Object help, frame;
if (! f || ! f->n_tool_bar_items || NILP (f->tool_bar_items))
......@@ -4366,7 +4361,7 @@ tb_size_cb (GtkWidget *widget,
/* When tool bar is created it has one preferred size. But when size is
allocated between widgets, it may get another. So we must update
size hints if tool bar size changes. Seen on Fedora 18 at least. */
struct frame *f = (struct frame *) user_data;
struct frame *f = user_data;
if (xg_update_tool_bar_sizes (f))
x_wm_set_size_hint (f, 0, 0);
}
......
......@@ -3332,7 +3332,7 @@ static int
xpm_alloc_color (Display *dpy, Colormap cmap, char *color_name, XColor *color,
void *closure)
{
return xpm_lookup_color ((struct frame *) closure, color_name, color);
return xpm_lookup_color (closure, color_name, color);
}
......@@ -5652,8 +5652,7 @@ struct png_memory_storage
static void
png_read_from_memory (png_structp png_ptr, png_bytep data, png_size_t length)
{
struct png_memory_storage *tbr
= (struct png_memory_storage *) fn_png_get_io_ptr (png_ptr);
struct png_memory_storage *tbr = fn_png_get_io_ptr (png_ptr);
if (length > tbr->len - tbr->index)
fn_png_error (png_ptr, "Read error");
......@@ -5670,7 +5669,7 @@ png_read_from_memory (png_structp png_ptr, png_bytep data, png_size_t length)
static void
png_read_from_file (png_structp png_ptr, png_bytep data, png_size_t length)
{
FILE *fp = (FILE *) fn_png_get_io_ptr (png_ptr);
FILE *fp = fn_png_get_io_ptr (png_ptr);
if (fread (data, 1, length, fp) < length)
fn_png_error (png_ptr, "Read error");
......@@ -5814,9 +5813,9 @@ png_load_body (struct frame *f, struct image *img, struct png_load_context *c)
/* Read image info. */
if (!NILP (specified_data))
fn_png_set_read_fn (png_ptr, (void *) &tbr, png_read_from_memory);
fn_png_set_read_fn (png_ptr, &tbr, png_read_from_memory);
else
fn_png_set_read_fn (png_ptr, (void *) fp, png_read_from_file);
fn_png_set_read_fn (png_ptr, fp, png_read_from_file);
fn_png_set_sig_bytes (png_ptr, sizeof sig);
fn_png_read_info (png_ptr, info_ptr);
......@@ -6306,7 +6305,7 @@ our_memory_fill_input_buffer (j_decompress_ptr cinfo)
static void
our_memory_skip_input_data (j_decompress_ptr cinfo, long int num_bytes)
{
struct jpeg_source_mgr *src = (struct jpeg_source_mgr *) cinfo->src;
struct jpeg_source_mgr *src = cinfo->src;
if (src)
{
......@@ -6326,19 +6325,17 @@ our_memory_skip_input_data (j_decompress_ptr cinfo, long int num_bytes)
static void
jpeg_memory_src (j_decompress_ptr cinfo, JOCTET *data, ptrdiff_t len)
{
struct jpeg_source_mgr *src;
struct jpeg_source_mgr *src = cinfo->src;
if (cinfo->src == NULL)
if (! src)
{
/* First time for this JPEG object? */
cinfo->src = (struct jpeg_source_mgr *)
(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
sizeof (struct jpeg_source_mgr));
src = (struct jpeg_source_mgr *) cinfo->src;
src = cinfo->mem->alloc_small ((j_common_ptr) cinfo,
JPOOL_PERMANENT, sizeof *src);
cinfo->src = src;
src->next_input_byte = data;
}
src = (struct jpeg_source_mgr *) cinfo->src;
src->init_source = our_common_init_source;
src->fill_input_buffer = our_memory_fill_input_buffer;
src->skip_input_data = our_memory_skip_input_data;
......@@ -6430,20 +6427,17 @@ our_stdio_skip_input_data (j_decompress_ptr cinfo, long int num_bytes)
static void
jpeg_file_src (j_decompress_ptr cinfo, FILE *fp)
{
struct jpeg_stdio_mgr *src;
struct jpeg_stdio_mgr *src = (struct jpeg_stdio_mgr *) cinfo->src;
if (cinfo->src != NULL)
src = (struct jpeg_stdio_mgr *) cinfo->src;
else
if (! src)
{
/* First time for this JPEG object? */
cinfo->src = (struct jpeg_source_mgr *)
(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
sizeof (struct jpeg_stdio_mgr));
src = (struct jpeg_stdio_mgr *) cinfo->src;
src->buffer = (JOCTET *)
(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
JPEG_STDIO_BUFFER_SIZE);
src = cinfo->mem->alloc_small ((j_common_ptr) cinfo,
JPOOL_PERMANENT, sizeof *src);
cinfo->src = (struct jpeg_source_mgr *) src;
src->buffer = cinfo->mem->alloc_small ((j_common_ptr) cinfo,
JPOOL_PERMANENT,
JPEG_STDIO_BUFFER_SIZE);
}
src->file = fp;
......@@ -8120,7 +8114,7 @@ imagemagick_load_image (struct frame *f, struct image *img,
/* Copy pixels from the imagemagick image structure to the x image map. */
iterator = NewPixelIterator (image_wand);
if (iterator == (PixelIterator *) NULL)
if (! iterator)
{
#ifdef COLOR_TABLE_SUPPORT
free_color_table ();
......@@ -8135,7 +8129,7 @@ imagemagick_load_image (struct frame *f, struct image *img,
for (y = 0; y < image_height; y++)
{
pixels = PixelGetNextIteratorRow (iterator, &width);
if (pixels == (PixelWand **) NULL)
if (! pixels)
break;
for (x = 0; x < (long) width; x++)
{
......@@ -9200,7 +9194,7 @@ A cross is always drawn on black & white displays. */);
DEFVAR_LISP ("x-bitmap-file-path", Vx_bitmap_file_path,
doc: /* List of directories to search for window system bitmap files. */);
Vx_bitmap_file_path = decode_env_path ((char *) 0, PATH_BITMAPS);
Vx_bitmap_file_path = decode_env_path (0, PATH_BITMAPS);
DEFVAR_LISP ("image-cache-eviction-delay", Vimage_cache_eviction_delay,
doc: /* Maximum time after which images are removed from the cache.
......
......@@ -3249,8 +3249,7 @@ describe_map (Lisp_Object map, Lisp_Object prefix,
for (tail = map; CONSP (tail); tail = XCDR (tail))
length_needed++;
vect = ((struct describe_map_elt *)
alloca (sizeof (struct describe_map_elt) * length_needed));
vect = alloca (length_needed * sizeof *vect);
for (tail = map; CONSP (tail); tail = XCDR (tail))
{
......
......@@ -2447,7 +2447,7 @@ and GNUstep implementations ("distributor-specific release
if (n_monitors == 0)
return Qnil;
monitors = (struct MonitorInfo *) xzalloc (n_monitors * sizeof (*monitors));
monitors = xzalloc (n_monitors * sizeof *monitors);
for (i = 0; i < [screens count]; ++i)
{
......
......@@ -1665,7 +1665,7 @@ - (void)process_dialog: (Lisp_Object) list
}
if (buttons > 0)
button_values = (Lisp_Object *) xmalloc (buttons * sizeof (*button_values));
button_values = xmalloc (buttons * sizeof *button_values);
for (; XTYPE (list) == Lisp_Cons; list = XCDR (list))
{
......
......@@ -344,8 +344,8 @@ Updated by Christian Limpach (chris@nice.ch)
{
if (hold_event_q.cap == 0) hold_event_q.cap = 10;
else hold_event_q.cap *= 2;
hold_event_q.q = (struct input_event *)
xrealloc (hold_event_q.q, hold_event_q.cap * sizeof (*hold_event_q.q));
hold_event_q.q =
xrealloc (hold_event_q.q, hold_event_q.cap * sizeof *hold_event_q.q);
}
hold_event_q.q[hold_event_q.nr++] = *event;
......
......@@ -4526,7 +4526,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
#endif
(max (max_process_desc, max_input_desc) + 1,
&Available,
(check_write ? &Writeok : (SELECT_TYPE *)0),
(check_write ? &Writeok : 0),
NULL, &timeout, NULL);
#ifdef HAVE_GNUTLS
......
......@@ -468,7 +468,7 @@ init_syntax_once (void)
/* Assumes a `char *destination' variable. */
# define REGEX_REALLOCATE(source, osize, nsize) \
(destination = (char *) alloca (nsize), \
(destination = alloca (nsize), \
memcpy (destination, source, osize))
/* No need to do anything to free, after alloca. */
......@@ -4208,7 +4208,7 @@ re_set_registers (struct re_pattern_buffer *bufp, struct re_registers *regs, uns
{
bufp->regs_allocated = REGS_UNALLOCATED;
regs->num_regs = 0;
regs->start = regs->end = (regoff_t *) 0;
regs->start = regs->end = 0;
}
}
WEAK_ALIAS (__re_set_registers, re_set_registers)
......@@ -6395,8 +6395,7 @@ weak_function
re_exec (const char *s)
{
const size_t len = strlen (s);
return (re_search (&re_comp_buf, s, len, 0, len, (struct re_registers *) 0)
>= 0);
return re_search (&re_comp_buf, s, len, 0, len, 0) >= 0;
}
#endif /* _REGEX_RE_COMP */
......@@ -6560,7 +6559,7 @@ regexec (const regex_t *_Restrict_ preg, const char *_Restrict_ string,
/* Perform the searching operation. */
ret = re_search (&private_preg, string, len,
/* start: */ 0, /* range: */ len,
want_reg_info ? &regs : (struct re_registers *) 0);
want_reg_info ? &regs : 0);
/* Copy the register information to the POSIX structure. */
if (want_reg_info)
......
......@@ -652,8 +652,7 @@ do_direct_scrolling (struct frame *frame, struct glyph_matrix *current_matrix,
/* A queue of deletions and insertions to be performed. */
struct alt_queue { int count, pos, window; };
struct alt_queue *queue_start = (struct alt_queue *)
alloca (window_size * sizeof *queue_start);
struct alt_queue *queue_start = alloca (window_size * sizeof *queue_start);
struct alt_queue *queue = queue_start;
/* True if a terminal window has been set with set_terminal_window. */
......@@ -797,9 +796,8 @@ scrolling_1 (struct frame *frame, int window_size, int unchanged_at_top,
int unchanged_at_bottom, int *draw_cost, int *old_draw_cost,
int *old_hash, int *new_hash, int free_at_end)
{
struct matrix_elt *matrix;
matrix = ((struct matrix_elt *)
alloca ((window_size + 1) * (window_size + 1) * sizeof *matrix));
struct matrix_elt *matrix
= alloca ((window_size + 1) * (window_size + 1) * sizeof *matrix);
if (FRAME_SCROLL_REGION_OK (frame))
{
......
......@@ -406,7 +406,7 @@ tgetent (char *bp, const char *name)