From b2a83eed23d540b4b0ab9e0bf5605821011bfd7d Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 18 Feb 2017 18:16:37 -0800 Subject: [PATCH] Use 'char *FOO' instead of 'char* FOO' --- src/alloc.c | 6 +++--- src/callproc.c | 2 +- src/data.c | 2 +- src/dbusbind.c | 2 +- src/emacsgtkfixed.c | 6 +++--- src/gnutls.c | 14 +++++++------- src/gtkutil.c | 2 +- src/inotify.c | 2 +- src/intervals.h | 2 +- src/keymap.c | 2 +- src/menu.c | 2 +- src/nsfns.m | 6 +++--- src/nsfont.m | 2 +- src/nsterm.h | 4 ++-- src/nsterm.m | 6 +++--- src/process.c | 2 +- src/regex.c | 26 +++++++++++++------------- src/term.c | 11 +++++++---- src/widget.c | 12 ++++++------ src/widget.h | 2 +- src/widgetprv.h | 4 ++-- 21 files changed, 60 insertions(+), 57 deletions(-) diff --git a/src/alloc.c b/src/alloc.c index 62f43669f2a..deb1ca32500 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -7237,9 +7237,9 @@ find_suspicious_object_in_range (void *begin, void *end) } static void -note_suspicious_free (void* ptr) +note_suspicious_free (void *ptr) { - struct suspicious_free_record* rec; + struct suspicious_free_record *rec; rec = &suspicious_free_history[suspicious_free_history_index++]; if (suspicious_free_history_index == @@ -7254,7 +7254,7 @@ note_suspicious_free (void* ptr) } static void -detect_suspicious_free (void* ptr) +detect_suspicious_free (void *ptr) { int i; diff --git a/src/callproc.c b/src/callproc.c index 84324c48dcf..08fa6e97722 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -1381,7 +1381,7 @@ getenv_internal (const char *var, ptrdiff_t varlen, char **value, without recording them in Vprocess_environment. */ #ifdef WINDOWSNT { - char* tmpval = getenv (var); + char *tmpval = getenv (var); if (tmpval) { *value = tmpval; diff --git a/src/data.c b/src/data.c index ba5bdc5df3a..32ec89871a8 100644 --- a/src/data.c +++ b/src/data.c @@ -1426,7 +1426,7 @@ set_internal (Lisp_Object symbol, Lisp_Object newval, Lisp_Object where, static void set_symbol_trapped_write (Lisp_Object symbol, enum symbol_trapped_write trap) { - struct Lisp_Symbol* sym = XSYMBOL (symbol); + struct Lisp_Symbol *sym = XSYMBOL (symbol); if (sym->trapped_write == SYMBOL_NOWRITE) xsignal1 (Qtrapping_constant, symbol); sym->trapped_write = trap; diff --git a/src/dbusbind.c b/src/dbusbind.c index 077e8fdc06d..e7c3251c14b 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c @@ -941,7 +941,7 @@ xd_get_connection_references (DBusConnection *connection) } /* Convert a Lisp D-Bus object to a pointer. */ -static DBusConnection* +static DBusConnection * xd_lisp_dbus_to_dbus (Lisp_Object bus) { return (DBusConnection *) XSAVE_POINTER (bus, 0); diff --git a/src/emacsgtkfixed.c b/src/emacsgtkfixed.c index 64b74ea24ce..75cb3c1c727 100644 --- a/src/emacsgtkfixed.c +++ b/src/emacsgtkfixed.c @@ -148,7 +148,7 @@ emacs_fixed_class_init (EmacsFixedClass *klass) { GtkWidgetClass *widget_class; - widget_class = (GtkWidgetClass*) klass; + widget_class = (GtkWidgetClass *) klass; widget_class->get_preferred_width = emacs_fixed_get_preferred_width; widget_class->get_preferred_height = emacs_fixed_get_preferred_height; @@ -205,9 +205,9 @@ emacs_fixed_get_preferred_height (GtkWidget *widget, (Bug#8919), and so users can resize our frames as they wish. */ void -XSetWMSizeHints (Display* d, +XSetWMSizeHints (Display *d, Window w, - XSizeHints* hints, + XSizeHints *hints, Atom prop) { struct x_display_info *dpyinfo = x_display_info_for_display (d); diff --git a/src/gnutls.c b/src/gnutls.c index d0d7f2dfc84..28ab10de05c 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -142,7 +142,7 @@ DEF_DLL_FN (int, gnutls_x509_crt_get_dn, (gnutls_x509_crt_t, char *, size_t *)); DEF_DLL_FN (int, gnutls_x509_crt_get_pk_algorithm, (gnutls_x509_crt_t, unsigned int *)); -DEF_DLL_FN (const char*, gnutls_pk_algorithm_get_name, +DEF_DLL_FN (const char *, gnutls_pk_algorithm_get_name, (gnutls_pk_algorithm_t)); DEF_DLL_FN (int, gnutls_pk_bits_to_sec_param, (gnutls_pk_algorithm_t, unsigned int)); @@ -154,22 +154,22 @@ DEF_DLL_FN (int, gnutls_x509_crt_get_signature_algorithm, (gnutls_x509_crt_t)); DEF_DLL_FN (int, gnutls_x509_crt_get_key_id, (gnutls_x509_crt_t, unsigned int, unsigned char *, size_t *_size)); -DEF_DLL_FN (const char*, gnutls_sec_param_get_name, (gnutls_sec_param_t)); -DEF_DLL_FN (const char*, gnutls_sign_get_name, (gnutls_sign_algorithm_t)); +DEF_DLL_FN (const char *, gnutls_sec_param_get_name, (gnutls_sec_param_t)); +DEF_DLL_FN (const char *, gnutls_sign_get_name, (gnutls_sign_algorithm_t)); DEF_DLL_FN (int, gnutls_server_name_set, (gnutls_session_t, gnutls_server_name_type_t, const void *, size_t)); DEF_DLL_FN (gnutls_kx_algorithm_t, gnutls_kx_get, (gnutls_session_t)); -DEF_DLL_FN (const char*, gnutls_kx_get_name, (gnutls_kx_algorithm_t)); +DEF_DLL_FN (const char *, gnutls_kx_get_name, (gnutls_kx_algorithm_t)); DEF_DLL_FN (gnutls_protocol_t, gnutls_protocol_get_version, (gnutls_session_t)); -DEF_DLL_FN (const char*, gnutls_protocol_get_name, (gnutls_protocol_t)); +DEF_DLL_FN (const char *, gnutls_protocol_get_name, (gnutls_protocol_t)); DEF_DLL_FN (gnutls_cipher_algorithm_t, gnutls_cipher_get, (gnutls_session_t)); -DEF_DLL_FN (const char*, gnutls_cipher_get_name, +DEF_DLL_FN (const char *, gnutls_cipher_get_name, (gnutls_cipher_algorithm_t)); DEF_DLL_FN (gnutls_mac_algorithm_t, gnutls_mac_get, (gnutls_session_t)); -DEF_DLL_FN (const char*, gnutls_mac_get_name, (gnutls_mac_algorithm_t)); +DEF_DLL_FN (const char *, gnutls_mac_get_name, (gnutls_mac_algorithm_t)); static bool diff --git a/src/gtkutil.c b/src/gtkutil.c index b028254a51a..3a00e362221 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -1694,7 +1694,7 @@ pop_down_dialog (void *arg) } /* If there are any emacs timers pending, add a timeout to main loop in DATA. - We pass in DATA as gpointer* so we can use this as a callback. */ + Pass DATA as gpointer so we can use this as a callback. */ static gboolean xg_maybe_add_timer (gpointer data) diff --git a/src/inotify.c b/src/inotify.c index 701d8ff3b32..61ef6153286 100644 --- a/src/inotify.c +++ b/src/inotify.c @@ -145,7 +145,7 @@ inotify_callback (int fd, void *_) i = 0; while (i < (size_t)n) { - struct inotify_event *ev = (struct inotify_event*)&buffer[i]; + struct inotify_event *ev = (struct inotify_event *) &buffer[i]; watch_object = Fassoc (make_watch_descriptor (ev->wd), watch_list); if (!NILP (watch_object)) diff --git a/src/intervals.h b/src/intervals.h index cd0ba9ad70a..db91b3f21a0 100644 --- a/src/intervals.h +++ b/src/intervals.h @@ -290,7 +290,7 @@ Lisp_Object text_property_list (Lisp_Object, Lisp_Object, Lisp_Object, void add_text_properties_from_list (Lisp_Object, Lisp_Object, Lisp_Object); Lisp_Object extend_property_ranges (Lisp_Object, Lisp_Object, Lisp_Object); Lisp_Object get_char_property_and_overlay (Lisp_Object, Lisp_Object, - Lisp_Object, Lisp_Object*); + Lisp_Object, Lisp_Object *); extern int text_property_stickiness (Lisp_Object prop, Lisp_Object pos, Lisp_Object buffer); diff --git a/src/keymap.c b/src/keymap.c index 9caf55f98fb..b568f47cba7 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -93,7 +93,7 @@ static void describe_command (Lisp_Object, Lisp_Object); static void describe_translation (Lisp_Object, Lisp_Object); static void describe_map (Lisp_Object, Lisp_Object, void (*) (Lisp_Object, Lisp_Object), - bool, Lisp_Object, Lisp_Object*, bool, bool); + bool, Lisp_Object, Lisp_Object *, bool, bool); static void describe_vector (Lisp_Object, Lisp_Object, Lisp_Object, void (*) (Lisp_Object, Lisp_Object), bool, Lisp_Object, Lisp_Object, bool, bool); diff --git a/src/menu.c b/src/menu.c index 14272dc0c35..99a2ce8f7ef 100644 --- a/src/menu.c +++ b/src/menu.c @@ -603,7 +603,7 @@ free_menubar_widget_value_tree (widget_value *wv) wv->name = wv->value = wv->key = (char *) 0xDEADBEEF; - if (wv->contents && (wv->contents != (widget_value*)1)) + if (wv->contents && (wv->contents != (widget_value *) 1)) { free_menubar_widget_value_tree (wv->contents); wv->contents = (widget_value *) 0xDEADBEEF; diff --git a/src/nsfns.m b/src/nsfns.m index a709935db96..9e904c68382 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -2074,10 +2074,10 @@ static int ns_do_applescript (Lisp_Object script, Lisp_Object *result) { NSAppleEventDescriptor *desc; - NSDictionary* errorDict; - NSAppleEventDescriptor* returnDescriptor = NULL; + NSDictionary *errorDict; + NSAppleEventDescriptor *returnDescriptor = NULL; - NSAppleScript* scriptObject = + NSAppleScript *scriptObject = [[NSAppleScript alloc] initWithSource: [NSString stringWithUTF8String: SSDATA (script)]]; diff --git a/src/nsfont.m b/src/nsfont.m index d9cae8c27d1..1bfc3df1469 100644 --- a/src/nsfont.m +++ b/src/nsfont.m @@ -855,7 +855,7 @@ nsfont_open (struct frame *f, Lisp_Object font_entity, int pixel_size) ((CFStringRef)@"Monaco", kATSOptionFlagsDefault); } } - font_info->cgfont = CGFontCreateWithPlatformFont ((void*)&atsFont); + font_info->cgfont = CGFontCreateWithPlatformFont ((void *) &atsFont); } #endif diff --git a/src/nsterm.h b/src/nsterm.h index 534ec68c22b..53d9344cc78 100644 --- a/src/nsterm.h +++ b/src/nsterm.h @@ -53,7 +53,7 @@ along with GNU Emacs. If not, see . */ /* CGFloat on GNUstep may be 4 or 8 byte, but functions expect float* for some versions. - On Cocoa >= 10.5, functions expect CGFloat*. Make compatible type. */ + On Cocoa >= 10.5, functions expect CGFloat *. Make compatible type. */ #ifdef NS_IMPL_COCOA typedef CGFloat EmacsCGFloat; #elif GNUSTEP_GUI_MAJOR_VERSION > 0 || GNUSTEP_GUI_MINOR_VERSION >= 22 @@ -1198,7 +1198,7 @@ extern void ns_finish_events (void); #ifdef __OBJC__ /* Needed in nsfns.m. */ extern void -ns_set_represented_filename (NSString* fstr, struct frame *f); +ns_set_represented_filename (NSString *fstr, struct frame *f); #endif diff --git a/src/nsterm.m b/src/nsterm.m index 63f1b15b24e..28764c8a4fb 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -423,14 +423,14 @@ static void ns_judge_scroll_bars (struct frame *f); ========================================================================== */ void -ns_set_represented_filename (NSString* fstr, struct frame *f) +ns_set_represented_filename (NSString *fstr, struct frame *f) { represented_filename = [fstr retain]; represented_frame = f; } void -ns_init_events (struct input_event* ev) +ns_init_events (struct input_event *ev) { EVENT_INIT (*ev); emacs_event = ev; @@ -5817,7 +5817,7 @@ not_in_argv (NSString *arg) Handle uchrHandle = GetResource ('uchr', GetScriptVariable (smv, smScriptKeys)); UInt32 dummy = 0; - UCKeyTranslate ((UCKeyboardLayout*)*uchrHandle, + UCKeyTranslate ((UCKeyboardLayout *) *uchrHandle, [[theEvent characters] characterAtIndex: 0], kUCKeyActionDisplay, (flags & ~NSEventModifierFlagCommand) >> 8, diff --git a/src/process.c b/src/process.c index 434a3955b2c..2f2e5c1b251 100644 --- a/src/process.c +++ b/src/process.c @@ -4379,7 +4379,7 @@ network_interface_info (Lisp_Object ifname) for (it = ifap; it != NULL; it = it->ifa_next) { - struct sockaddr_dl *sdl = (struct sockaddr_dl*) it->ifa_addr; + struct sockaddr_dl *sdl = (struct sockaddr_dl *) it->ifa_addr; unsigned char linkaddr[6]; int n; diff --git a/src/regex.c b/src/regex.c index 796f868d1c2..8e38a920cdb 100644 --- a/src/regex.c +++ b/src/regex.c @@ -1421,7 +1421,7 @@ do { \ { \ /* It's a counter. */ \ /* Here, we discard `const', making re_match non-reentrant. */ \ - unsigned char *ptr = (unsigned char*) POP_FAILURE_POINTER (); \ + unsigned char *ptr = (unsigned char *) POP_FAILURE_POINTER (); \ pfreg = POP_FAILURE_INT (); \ STORE_NUMBER (ptr, pfreg); \ DEBUG_PRINT (" Pop counter %p = %ld\n", ptr, pfreg); \ @@ -4220,8 +4220,8 @@ re_search_2 (struct re_pattern_buffer *bufp, const char *str1, size_t size1, struct re_registers *regs, ssize_t stop) { regoff_t val; - re_char *string1 = (re_char*) str1; - re_char *string2 = (re_char*) str2; + re_char *string1 = (re_char *) str1; + re_char *string2 = (re_char *) str2; register char *fastmap = bufp->fastmap; register RE_TRANSLATE_TYPE translate = bufp->translate; size_t total_size = size1 + size2; @@ -4887,7 +4887,7 @@ regoff_t re_match (struct re_pattern_buffer *bufp, const char *string, size_t size, ssize_t pos, struct re_registers *regs) { - regoff_t result = re_match_2_internal (bufp, NULL, 0, (re_char*) string, + regoff_t result = re_match_2_internal (bufp, NULL, 0, (re_char *) string, size, pos, regs, size); return result; } @@ -4921,8 +4921,8 @@ re_match_2 (struct re_pattern_buffer *bufp, const char *string1, SETUP_SYNTAX_TABLE_FOR_OBJECT (re_match_object, charpos, 1); #endif - result = re_match_2_internal (bufp, (re_char*) string1, size1, - (re_char*) string2, size2, + result = re_match_2_internal (bufp, (re_char *) string1, size1, + (re_char *) string2, size2, pos, regs, stop); return result; } @@ -5785,8 +5785,8 @@ re_match_2_internal (struct re_pattern_buffer *bufp, const_re_char *string1, { re_char *p1 = p; /* Next operation. */ /* Here, we discard `const', making re_match non-reentrant. */ - unsigned char *p2 = (unsigned char*) p + mcnt; /* Jump dest. */ - unsigned char *p3 = (unsigned char*) p - 3; /* opcode location. */ + unsigned char *p2 = (unsigned char *) p + mcnt; /* Jump dest. */ + unsigned char *p3 = (unsigned char *) p - 3; /* opcode location. */ p -= 3; /* Reset so that we will re-execute the instruction once it's been changed. */ @@ -5837,7 +5837,7 @@ re_match_2_internal (struct re_pattern_buffer *bufp, const_re_char *string1, if (mcnt != 0) { /* Here, we discard `const', making re_match non-reentrant. */ - unsigned char *p2 = (unsigned char*) p + 2; /* counter loc. */ + unsigned char *p2 = (unsigned char *) p + 2; /* counter loc. */ mcnt--; p += 4; PUSH_NUMBER (p2, mcnt); @@ -5856,7 +5856,7 @@ re_match_2_internal (struct re_pattern_buffer *bufp, const_re_char *string1, if (mcnt != 0) { /* Here, we discard `const', making re_match non-reentrant. */ - unsigned char *p2 = (unsigned char*) p + 2; /* counter loc. */ + unsigned char *p2 = (unsigned char *) p + 2; /* counter loc. */ mcnt--; PUSH_NUMBER (p2, mcnt); goto unconditional_jump; @@ -5873,7 +5873,7 @@ re_match_2_internal (struct re_pattern_buffer *bufp, const_re_char *string1, EXTRACT_NUMBER_AND_INCR (mcnt, p); /* Here, we discard `const', making re_match non-reentrant. */ - p2 = (unsigned char*) p + mcnt; + p2 = (unsigned char *) p + mcnt; /* Signedness doesn't matter since we only copy MCNT's bits. */ EXTRACT_NUMBER_AND_INCR (mcnt, p); DEBUG_PRINT (" Setting %p to %d.\n", p2, mcnt); @@ -6283,7 +6283,7 @@ re_compile_pattern (const char *pattern, size_t length, setting no_sub. */ bufp->no_sub = 0; - ret = regex_compile ((re_char*) pattern, length, + ret = regex_compile ((re_char *) pattern, length, #ifdef emacs posix_backtracking, whitespace_regexp, @@ -6446,7 +6446,7 @@ regcomp (regex_t *_Restrict_ preg, const char *_Restrict_ pattern, /* POSIX says a null character in the pattern terminates it, so we can use strlen here in compiling the pattern. */ - ret = regex_compile ((re_char*) pattern, strlen (pattern), syntax, preg); + ret = regex_compile ((re_char *) pattern, strlen (pattern), syntax, preg); /* POSIX doesn't distinguish between an unmatched open-group and an unmatched close-group: both are REG_EPAREN. */ diff --git a/src/term.c b/src/term.c index 35fa8c931c1..8770aff8a92 100644 --- a/src/term.c +++ b/src/term.c @@ -2536,7 +2536,8 @@ term_mouse_click (struct input_event *result, Gpm_Event *event, } int -handle_one_term_event (struct tty_display_info *tty, Gpm_Event *event, struct input_event* hold_quit) +handle_one_term_event (struct tty_display_info *tty, Gpm_Event *event, + struct input_event *hold_quit) { struct frame *f = XFRAME (tty->top_frame); struct input_event ie; @@ -4134,9 +4135,11 @@ use the Bourne shell command 'TERM=...; export TERM' (C-shell:\n\ #ifdef TERMINFO /* Non-standard support for 24-bit colors. */ { - const char* fg = tigetstr ("setf24"); - const char* bg = tigetstr ("setb24"); - if (fg && bg && fg != (char *)-1 && bg != (char *)-1) + const char *fg = tigetstr ("setf24"); + const char *bg = tigetstr ("setb24"); + if (fg && bg + && fg != (char *) (intptr_t) -1 + && bg != (char *) (intptr_t) -1) { tty->TS_set_foreground = fg; tty->TS_set_background = bg; diff --git a/src/widget.c b/src/widget.c index b05fd8310ab..96555ed2ac7 100644 --- a/src/widget.c +++ b/src/widget.c @@ -148,7 +148,7 @@ WidgetClass emacsFrameClass = (WidgetClass) &emacsFrameClassRec; static void get_default_char_pixel_size (EmacsFrame ew, int *pixel_width, int *pixel_height) { - struct frame* f = ew->emacs_frame.frame; + struct frame *f = ew->emacs_frame.frame; *pixel_width = FRAME_COLUMN_WIDTH (f); *pixel_height = FRAME_LINE_HEIGHT (f); } @@ -156,7 +156,7 @@ get_default_char_pixel_size (EmacsFrame ew, int *pixel_width, int *pixel_height) static void pixel_to_char_size (EmacsFrame ew, Dimension pixel_width, Dimension pixel_height, int *char_width, int *char_height) { - struct frame* f = ew->emacs_frame.frame; + struct frame *f = ew->emacs_frame.frame; *char_width = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, (int) pixel_width); *char_height = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, (int) pixel_height); } @@ -164,7 +164,7 @@ pixel_to_char_size (EmacsFrame ew, Dimension pixel_width, Dimension pixel_height static void pixel_to_text_size (EmacsFrame ew, Dimension pixel_width, Dimension pixel_height, int *text_width, int *text_height) { - struct frame* f = ew->emacs_frame.frame; + struct frame *f = ew->emacs_frame.frame; *text_width = FRAME_PIXEL_TO_TEXT_WIDTH (f, (int) pixel_width); *text_height = FRAME_PIXEL_TO_TEXT_HEIGHT (f, (int) pixel_height); } @@ -172,7 +172,7 @@ pixel_to_text_size (EmacsFrame ew, Dimension pixel_width, Dimension pixel_height static void char_to_pixel_size (EmacsFrame ew, int char_width, int char_height, Dimension *pixel_width, Dimension *pixel_height) { - struct frame* f = ew->emacs_frame.frame; + struct frame *f = ew->emacs_frame.frame; *pixel_width = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, char_width); *pixel_height = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, char_height); } @@ -365,8 +365,8 @@ EmacsFrameInitialize (Widget request, Widget new, ArgList dum1, Cardinal *dum2) static void resize_cb (Widget widget, XtPointer closure, - XEvent* event, - Boolean* continue_to_dispatch) + XEvent *event, + Boolean *continue_to_dispatch) { EmacsFrameResize (widget); } diff --git a/src/widget.h b/src/widget.h index bb36f61a8f0..2c5fb61df2f 100644 --- a/src/widget.h +++ b/src/widget.h @@ -92,7 +92,7 @@ typedef struct _EmacsFrameClassRec *EmacsFrameClass; extern WidgetClass emacsFrameClass; -extern struct _DisplayContext* display_context; +extern struct _DisplayContext *display_context; /* Special entry points */ void EmacsFrameSetCharSize (Widget, int, int); diff --git a/src/widgetprv.h b/src/widgetprv.h index 9d31bddbe78..309aed779da 100644 --- a/src/widgetprv.h +++ b/src/widgetprv.h @@ -25,11 +25,11 @@ along with GNU Emacs. If not, see . */ #include typedef struct { - struct frame* frame; /* the *emacs* frame object */ + struct frame *frame; /* the *emacs* frame object */ /* Resources that can't be done from lisp. */ - char* geometry; /* geometry spec of this frame */ + char * geometry; /* geometry spec of this frame */ Boolean iconic; /* whether this frame is iconic */ /* The rest of this is crap and should be deleted. -- 2.39.5