diff options
| author | Paul Eggert | 2012-08-03 16:36:11 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-08-03 16:36:11 -0700 |
| commit | 98c6f1e36ff487925280fa0b0340af9d058632b5 (patch) | |
| tree | 5601a2ac9433883b753a36f8d9c15f9d9d0b0eec /src/data.c | |
| parent | 8834c57aab03fb7ea9d92f9e995844ff7ce64b7b (diff) | |
| download | emacs-98c6f1e36ff487925280fa0b0340af9d058632b5.tar.gz emacs-98c6f1e36ff487925280fa0b0340af9d058632b5.zip | |
Remove unnecessary casts involving pointers.
These casts are no longer needed now that we assume C89 or later,
since they involve casting to or from void *.
* alloc.c (make_pure_string, make_pure_c_string, pure_cons)
(make_pure_float, make_pure_vector):
* lisp.h (SAFE_ALLOCA, SAFE_ALLOCA_LISP):
* macros.c (Fstart_kbd_macro):
* menu.c (find_and_return_menu_selection):
* minibuf.c (read_minibuf_noninteractive):
* sysdep.c (closedir):
* xdisp.c (x_produce_glyphs):
* xfaces.c (compare_fonts_by_sort_order):
* xfns.c (x_real_positions, select_visual):
* xselect.c (x_stop_queuing_selection_requests)
(x_get_window_property, x_get_window_property_as_lisp_data):
* xterm.c (x_set_frame_alpha, x_find_modifier_meanings):
Remove unnecessary pointer casts.
* alloc.c (record_xmalloc): New function.
* lisp.h (record_xmalloc): New decl.
(SAFE_ALLOCA): Now takes just one arg -- the size -- and acts
more like a function. This is because the pointer cast is not
needed. All uses changed.
* print.c (print_string, print_error_message): Avoid length recalc.
Diffstat (limited to 'src/data.c')
| -rw-r--r-- | src/data.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/data.c b/src/data.c index 4c6f7fe3eae..f5942a84da1 100644 --- a/src/data.c +++ b/src/data.c | |||
| @@ -2179,10 +2179,9 @@ bool-vector. IDX starts at 0. */) | |||
| 2179 | { | 2179 | { |
| 2180 | /* We must relocate the string data. */ | 2180 | /* We must relocate the string data. */ |
| 2181 | ptrdiff_t nchars = SCHARS (array); | 2181 | ptrdiff_t nchars = SCHARS (array); |
| 2182 | unsigned char *str; | ||
| 2183 | USE_SAFE_ALLOCA; | 2182 | USE_SAFE_ALLOCA; |
| 2183 | unsigned char *str = SAFE_ALLOCA (nbytes); | ||
| 2184 | 2184 | ||
| 2185 | SAFE_ALLOCA (str, unsigned char *, nbytes); | ||
| 2186 | memcpy (str, SDATA (array), nbytes); | 2185 | memcpy (str, SDATA (array), nbytes); |
| 2187 | allocate_string_data (XSTRING (array), nchars, | 2186 | allocate_string_data (XSTRING (array), nchars, |
| 2188 | nbytes + new_bytes - prev_bytes); | 2187 | nbytes + new_bytes - prev_bytes); |