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/lread.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/lread.c')
| -rw-r--r-- | src/lread.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/lread.c b/src/lread.c index d1549a34264..a31810ce463 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -4317,12 +4317,10 @@ dir_warning (const char *format, Lisp_Object dirname) | |||
| 4317 | /* Don't log the warning before we've initialized!! */ | 4317 | /* Don't log the warning before we've initialized!! */ |
| 4318 | if (initialized) | 4318 | if (initialized) |
| 4319 | { | 4319 | { |
| 4320 | char *buffer; | ||
| 4321 | ptrdiff_t message_len; | ||
| 4322 | USE_SAFE_ALLOCA; | 4320 | USE_SAFE_ALLOCA; |
| 4323 | SAFE_ALLOCA (buffer, char *, | 4321 | char *buffer = SAFE_ALLOCA (SBYTES (dirname) |
| 4324 | SBYTES (dirname) + strlen (format) - (sizeof "%s" - 1) + 1); | 4322 | + strlen (format) - (sizeof "%s" - 1) + 1); |
| 4325 | message_len = esprintf (buffer, format, SDATA (dirname)); | 4323 | ptrdiff_t message_len = esprintf (buffer, format, SDATA (dirname)); |
| 4326 | message_dolog (buffer, message_len, 0, STRING_MULTIBYTE (dirname)); | 4324 | message_dolog (buffer, message_len, 0, STRING_MULTIBYTE (dirname)); |
| 4327 | SAFE_FREE (); | 4325 | SAFE_FREE (); |
| 4328 | } | 4326 | } |