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/casefiddle.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/casefiddle.c')
| -rw-r--r-- | src/casefiddle.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/casefiddle.c b/src/casefiddle.c index 19fbc832288..81e84252b72 100644 --- a/src/casefiddle.c +++ b/src/casefiddle.c | |||
| @@ -114,12 +114,11 @@ casify_object (enum case_action flag, Lisp_Object obj) | |||
| 114 | ptrdiff_t i, i_byte, size = SCHARS (obj); | 114 | ptrdiff_t i, i_byte, size = SCHARS (obj); |
| 115 | int len; | 115 | int len; |
| 116 | USE_SAFE_ALLOCA; | 116 | USE_SAFE_ALLOCA; |
| 117 | unsigned char *dst, *o; | ||
| 118 | ptrdiff_t o_size = (size < STRING_BYTES_BOUND / MAX_MULTIBYTE_LENGTH | 117 | ptrdiff_t o_size = (size < STRING_BYTES_BOUND / MAX_MULTIBYTE_LENGTH |
| 119 | ? size * MAX_MULTIBYTE_LENGTH | 118 | ? size * MAX_MULTIBYTE_LENGTH |
| 120 | : STRING_BYTES_BOUND); | 119 | : STRING_BYTES_BOUND); |
| 121 | SAFE_ALLOCA (dst, void *, o_size); | 120 | unsigned char *dst = SAFE_ALLOCA (o_size); |
| 122 | o = dst; | 121 | unsigned char *o = dst; |
| 123 | 122 | ||
| 124 | for (i = i_byte = 0; i < size; i++, i_byte += len) | 123 | for (i = i_byte = 0; i < size; i++, i_byte += len) |
| 125 | { | 124 | { |