From 361358ea12271d5d747773a2d1ba743ee9516745 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Sun, 25 Jul 2010 02:20:51 +0200 Subject: [PATCH] Make building under stricter warning flags somewhat cleaner. Flags used: -Wold-style-declaration -Wunused-function -Wstrict-prototypes * lib-src/emacsclient.c (getcwd, w32_getenv): * lib-src/ntlib.h (getlogin, getuid, getegid, getgid): Fix prototypes. * nt/runemacs.c (set_user_model_id): Fix prototype. * src/callproc.c (relocate_fd): Set inside #ifndef WINDOWSNT. * src/dired.c (opendir, readdir): Fix prototypes. * src/editfns.c (w32_get_internal_run_time): Fix prototypes. * src/keyboard.c (input_available_signal): Declare inside #ifdef SIGIO. * src/ndir.h (opendir, readdir, seekdir, closedir): Fix prototypes. (telldir): Remove declaration. * src/ralloc.c (real_morecore, __morecore): Fix prototypes. * src/sound.c (alsa_sound_perror): Declare inside #ifdef HAVE_ALSA. * src/syssignal.h (strsignal): Fix prototype. * src/term.c (tparam): Fix prototype. (term_get_fkeys_address, term_get_fkeys_kboard, term_get_fkeys_1) (term_get_fkeys): Set inside "#ifndef DOS_NT". * src/vm-limit.c (check_memory_limits): Fix prototypes of real_morecore and __morecore. * src/w32gui.h (XParseGeometry): Fix prototype. * src/w32heap.h (get_data_start, get_data_end, init_heap): Fix prototypes. * src/w32term.c (my_set_focus): Declare inside #if 0. * src/w32term.h (x_window_to_frame, x_display_info_for_name, w32_term_init) (w32_fill_rect, w32_clear_window, init_crit, delete_crit, signal_quit) (drain_message_queue, get_next_msg, post_msg, parse_button) (ClipboardSequence_Proc): Fix prototypes. (wait_for_sync): Remove declaration. --- lib-src/ChangeLog | 5 +++++ lib-src/emacsclient.c | 12 ++++++------ lib-src/ntlib.h | 12 ++++++------ nt/ChangeLog | 4 ++++ nt/runemacs.c | 2 +- src/ChangeLog | 25 +++++++++++++++++++++++++ src/callproc.c | 10 +++++++--- src/dired.c | 4 ++-- src/editfns.c | 2 +- src/keyboard.c | 4 +++- src/ndir.h | 9 ++++----- src/ralloc.c | 4 ++-- src/sound.c | 2 ++ src/syssignal.h | 2 +- src/term.c | 4 +++- src/vm-limit.c | 4 ++-- src/w32gui.h | 2 +- src/w32heap.h | 6 +++--- src/w32term.c | 2 ++ src/w32term.h | 32 +++++++++++++++++--------------- 20 files changed, 97 insertions(+), 50 deletions(-) diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 50184ee58ad..09d139019e8 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,8 @@ +2010-07-25 Juanma Barranquero + + * emacsclient.c (getcwd, w32_getenv): + * ntlib.h (getlogin, getuid, getegid, getgid): Fix prototypes. + 2010-07-24 Dan Nicolaescu * update-game-score.c (usage): Add NO_RETURN specifier. diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index cbf988348dd..39b5956741d 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -82,10 +82,10 @@ along with GNU Emacs. If not, see . */ char *getenv (const char *), *getwd (char *); -char *(getcwd) (); +char *(getcwd) (char *, int); #ifdef WINDOWSNT -char *w32_getenv (); +char *w32_getenv (char *); #define egetenv(VAR) w32_getenv(VAR) #else #define egetenv(VAR) getenv(VAR) @@ -402,7 +402,7 @@ w32_set_user_model_id (void) /* On Windows 7 and later, we need to set the user model ID to associate emacsclient launched files with Emacs frames in the UI. */ - shell = LoadLibrary("shell32.dll"); + shell = LoadLibrary ("shell32.dll"); if (shell) { set_user_model @@ -432,7 +432,7 @@ w32_window_app (void) nonconsole apps. Testing for the console title seems to work. */ window_app = (GetConsoleTitleA (szTitle, MAX_PATH) == 0); if (window_app) - InitCommonControls(); + InitCommonControls (); } return window_app; @@ -483,7 +483,7 @@ ttyname (int fd) void message (int is_error, char *message, ...) { - char msg [2048]; + char msg[2048]; va_list args; va_start (args, message); @@ -1470,7 +1470,7 @@ start_daemon_and_retry_set_socket (void) pid_t w; w = waitpid (dpid, &status, WUNTRACED | WCONTINUED); - if ((w == -1) || !WIFEXITED (status) || WEXITSTATUS(status)) + if ((w == -1) || !WIFEXITED (status) || WEXITSTATUS (status)) { message (TRUE, "Error: Could not start the Emacs daemon\n"); exit (EXIT_FAILURE); diff --git a/lib-src/ntlib.h b/lib-src/ntlib.h index fd51269fdfd..4dd6a32ee32 100644 --- a/lib-src/ntlib.h +++ b/lib-src/ntlib.h @@ -30,14 +30,14 @@ along with GNU Emacs. If not, see . */ #ifdef sleep #undef sleep #endif -void sleep(unsigned long seconds); +void sleep (unsigned long seconds); char *getwd (char *dir); -int getppid(void); -char * getlogin (); +int getppid (void); +char * getlogin (void); char * cuserid (char * s); -unsigned getuid (); -unsigned getegid (); -unsigned getgid (); +unsigned getuid (void); +unsigned getegid (void); +unsigned getgid (void); int setuid (unsigned uid); int setegid (unsigned gid); char * getpass (const char * prompt); diff --git a/nt/ChangeLog b/nt/ChangeLog index fbf5bdbaa30..f0aad69d64d 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,7 @@ +2010-07-25 Juanma Barranquero + + * runemacs.c (set_user_model_id): Fix prototype. + 2010-07-24 Christoph Scholtes New make target for Windows platform: make dist (bug#6602) diff --git a/nt/runemacs.c b/nt/runemacs.c index d28d677dca8..f4d72062620 100644 --- a/nt/runemacs.c +++ b/nt/runemacs.c @@ -43,7 +43,7 @@ along with GNU Emacs. If not, see . */ #include #include -static void set_user_model_id (); +static void set_user_model_id (void); int WINAPI WinMain (HINSTANCE hSelf, HINSTANCE hPrev, LPSTR cmdline, int nShow) diff --git a/src/ChangeLog b/src/ChangeLog index 7234b4f843e..339e7b2beb2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,28 @@ +2010-07-25 Juanma Barranquero + + * callproc.c (relocate_fd): Set inside #ifndef WINDOWSNT. + * dired.c (opendir, readdir): Fix prototypes. + * editfns.c (w32_get_internal_run_time): Fix prototypes. + * keyboard.c (input_available_signal): Declare inside #ifdef SIGIO. + * ndir.h (opendir, readdir, seekdir, closedir): Fix prototypes. + (telldir): Remove declaration. + * ralloc.c (real_morecore, __morecore): Fix prototypes. + * sound.c (alsa_sound_perror): Declare inside #ifdef HAVE_ALSA. + * syssignal.h (strsignal): Fix prototype. + * term.c (tparam): Fix prototype. + (term_get_fkeys_address, term_get_fkeys_kboard, term_get_fkeys_1) + (term_get_fkeys): Set inside "#ifndef DOS_NT". + * vm-limit.c (check_memory_limits): Fix prototypes of real_morecore + and __morecore. + * w32gui.h (XParseGeometry): Fix prototype. + * w32heap.h (get_data_start, get_data_end, init_heap): Fix prototypes. + * w32term.c (my_set_focus): Declare inside #if 0. + * w32term.h (x_window_to_frame, x_display_info_for_name, w32_term_init) + (w32_fill_rect, w32_clear_window, init_crit, delete_crit, signal_quit) + (drain_message_queue, get_next_msg, post_msg, parse_button) + (ClipboardSequence_Proc): Fix prototypes. + (wait_for_sync): Remove declaration. + 2010-07-24 Juanma Barranquero * w32fns.c (w32_to_x_color): Remove, unused. diff --git a/src/callproc.c b/src/callproc.c index 4286ab1ae29..7f72df86ece 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -984,7 +984,9 @@ usage: (call-process-region START END PROGRAM &optional DELETE BUFFER DISPLAY &r RETURN_UNGCPRO (unbind_to (count, Fcall_process (nargs, args))); } +#ifndef WINDOWSNT static int relocate_fd (int fd, int minfd); +#endif static char ** add_env (char **env, char **new_env, char *string) @@ -1113,7 +1115,7 @@ child_setup (int in, int out, int err, register char **new_argv, int set_pgrp, L char **p, **q; register int new_length; Lisp_Object display = Qnil; - + new_length = 0; for (tem = Vprocess_environment; @@ -1149,7 +1151,7 @@ child_setup (int in, int out, int err, register char **new_argv, int set_pgrp, L but with corrected value. */ if (egetenv ("PWD")) *new_env++ = pwd_var; - + if (STRINGP (display)) { int vlen = strlen ("DISPLAY=") + strlen (SDATA (display)) + 1; @@ -1179,7 +1181,7 @@ child_setup (int in, int out, int err, register char **new_argv, int set_pgrp, L } } - + #ifdef WINDOWSNT prepare_standard_handles (in, out, err, handles); set_process_dir (SDATA (current_dir)); @@ -1265,6 +1267,7 @@ child_setup (int in, int out, int err, register char **new_argv, int set_pgrp, L #endif /* not MSDOS */ } +#ifndef WINDOWSNT /* Move the file descriptor FD so that its number is not less than MINFD. If the file descriptor is moved at all, the original is freed. */ static int @@ -1298,6 +1301,7 @@ relocate_fd (int fd, int minfd) return new; } } +#endif /* not WINDOWSNT */ static int getenv_internal_1 (const char *var, int varlen, char **value, int *valuelen, diff --git a/src/dired.c b/src/dired.c index cdb4545e81c..8f360e8879f 100644 --- a/src/dired.c +++ b/src/dired.c @@ -66,8 +66,8 @@ along with GNU Emacs. If not, see . */ #ifndef MSDOS #define DIRENTRY struct direct -extern DIR *opendir (); -extern struct direct *readdir (); +extern DIR *opendir (char *); +extern struct direct *readdir (DIR *); #endif /* not MSDOS */ #endif /* not SYSV_SYSTEM_DIR */ diff --git a/src/editfns.c b/src/editfns.c index 805dba60446..96ae1766e04 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -90,7 +90,7 @@ extern size_t emacs_strftimeu (char *, size_t, const char *, const struct tm *, int); #ifdef WINDOWSNT -extern Lisp_Object w32_get_internal_run_time (); +extern Lisp_Object w32_get_internal_run_time (void); #endif static int tm_diff (struct tm *, struct tm *); diff --git a/src/keyboard.c b/src/keyboard.c index c2f010cf4e7..1cc24f95bdc 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -635,7 +635,9 @@ static Lisp_Object apply_modifiers (int, Lisp_Object); static void clear_event (struct input_event *); static Lisp_Object restore_kboard_configuration (Lisp_Object); static SIGTYPE interrupt_signal (int signalnum); +#ifdef SIGIO static SIGTYPE input_available_signal (int signo); +#endif static void handle_interrupt (void); static void timer_start_idle (void); static void timer_stop_idle (void); @@ -3895,7 +3897,7 @@ kbd_buffer_get_event (KBOARD **kbp, { register int c; Lisp_Object obj; - + if (kbd_on_hold_p () && kbd_buffer_nr_stored () < KBD_BUFFER_SIZE/4) { /* Start reading input again, we have processed enough so we can diff --git a/src/ndir.h b/src/ndir.h index d7bac9d3fae..92d198334b7 100644 --- a/src/ndir.h +++ b/src/ndir.h @@ -32,11 +32,10 @@ typedef struct char dd_buf[DIRBLKSIZ]; /* directory block */ } DIR; /* stream data from opendir() */ -extern DIR *opendir(); -extern struct direct *readdir(); -extern long telldir(); -extern void seekdir(); -extern void closedir(); +extern DIR *opendir (char *); +extern struct direct *readdir (DIR *); +extern void seekdir (DIR *, long); +extern void closedir (DIR *); #define rewinddir( dirp ) seekdir( dirp, 0L ) diff --git a/src/ralloc.c b/src/ralloc.c index f0299873f54..5f2b52fcc4b 100644 --- a/src/ralloc.c +++ b/src/ralloc.c @@ -79,7 +79,7 @@ static void r_alloc_init (void); /* Declarations for working with the malloc, ralloc, and system breaks. */ /* Function to set the real break value. */ -POINTER (*real_morecore) (); +POINTER (*real_morecore) (long int); /* The break value, as seen by malloc. */ static POINTER virtual_break_value; @@ -111,7 +111,7 @@ static int extra_bytes; from the system. */ #ifndef SYSTEM_MALLOC -extern POINTER (*__morecore) (); +extern POINTER (*__morecore) (long int); #endif diff --git a/src/sound.c b/src/sound.c index e0ebd565151..4e3d583ccf0 100644 --- a/src/sound.c +++ b/src/sound.c @@ -115,7 +115,9 @@ enum sound_attr SOUND_ATTR_SENTINEL }; +#ifdef HAVE_ALSA static void alsa_sound_perror (char *, int) NO_RETURN; +#endif static void sound_perror (char *) NO_RETURN; static void sound_warning (char *); static int parse_sound (Lisp_Object, Lisp_Object *); diff --git a/src/syssignal.h b/src/syssignal.h index e3765add425..f034e9e0761 100644 --- a/src/syssignal.h +++ b/src/syssignal.h @@ -160,7 +160,7 @@ sigset_t sys_sigsetmask (sigset_t new_mask); #ifndef HAVE_STRSIGNAL /* strsignal is in sysdep.c */ -char *strsignal (); +char *strsignal (int); #endif #ifdef FORWARD_SIGNAL_TO_MAIN_THREAD diff --git a/src/term.c b/src/term.c index 3233db84cf7..25501370cdf 100644 --- a/src/term.c +++ b/src/term.c @@ -183,7 +183,7 @@ static int no_controlling_tty; static int system_uses_terminfo; -char *tparam (); +char *tparam (char *, char *, int, int, ...); extern char *tgetstr (char *, char **); @@ -1363,6 +1363,7 @@ static struct fkey_table keys[] = {"!3", "S-undo"} /*shifted undo key*/ }; +#ifndef DOS_NT static char **term_get_fkeys_address; static KBOARD *term_get_fkeys_kboard; static Lisp_Object term_get_fkeys_1 (void); @@ -1500,6 +1501,7 @@ term_get_fkeys_1 (void) return Qnil; } +#endif /* not DOS_NT */ /*********************************************************************** diff --git a/src/vm-limit.c b/src/vm-limit.c index b288276f394..06801db1a90 100644 --- a/src/vm-limit.c +++ b/src/vm-limit.c @@ -173,9 +173,9 @@ static void check_memory_limits (void) { #ifdef REL_ALLOC - extern POINTER (*real_morecore) (); + extern POINTER (*real_morecore) (SIZE); #endif - extern POINTER (*__morecore) (); + extern POINTER (*__morecore) (SIZE); register POINTER cp; unsigned long five_percent; diff --git a/src/w32gui.h b/src/w32gui.h index 07a6fed0b47..9cad4f21f21 100644 --- a/src/w32gui.h +++ b/src/w32gui.h @@ -118,7 +118,7 @@ extern int nCmdShow; #define PBaseSize (1L << 8) /* program specified base for incrementing */ #define PWinGravity (1L << 9) /* program specified window gravity */ -extern int XParseGeometry (); +extern int XParseGeometry (char *, int *, int *, unsigned *, unsigned *); typedef struct { diff --git a/src/w32heap.h b/src/w32heap.h index cbd7f7ae96d..20a49a4e0ac 100644 --- a/src/w32heap.h +++ b/src/w32heap.h @@ -41,8 +41,8 @@ along with GNU Emacs. If not, see . #define get_w32_major_version() w32_major_version #define get_w32_minor_version() w32_minor_version -extern unsigned char *get_data_start(); -extern unsigned char *get_data_end(); +extern unsigned char *get_data_start (void); +extern unsigned char *get_data_end (void); extern unsigned long reserved_heap_size; extern SYSTEM_INFO sysinfo_cache; extern OSVERSIONINFO osinfo_cache; @@ -62,7 +62,7 @@ extern int os_subtype; extern void *sbrk (unsigned long size); /* Initialize heap structures for sbrk on startup. */ -extern void init_heap (); +extern void init_heap (void); /* Round the heap to this size. */ extern void round_heap (unsigned long size); diff --git a/src/w32term.c b/src/w32term.c index abd7843c2ef..fc03034b14b 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -268,7 +268,9 @@ static void x_draw_bar_cursor (struct window *, struct glyph_row *, int, static void w32_clip_to_row (struct window *, struct glyph_row *, int, HDC); static BOOL my_show_window (struct frame *, HWND, int); static void my_set_window_pos (HWND, HWND, int, int, int, int, UINT); +#if 0 static void my_set_focus (struct frame *, HWND); +#endif static void my_set_foreground_window (HWND); static void my_destroy_window (struct frame *, HWND); diff --git a/src/w32term.h b/src/w32term.h index b5b3d4451f2..ea245144ac3 100644 --- a/src/w32term.h +++ b/src/w32term.h @@ -48,8 +48,6 @@ along with GNU Emacs. If not, see . */ extern MSG CurMsg; extern BOOL bUseDflt; -extern struct frame *x_window_to_frame (); - /* Structure recording bitmaps and reference count. If REFCOUNT is 0 then this record is free to be reused. */ @@ -226,13 +224,16 @@ extern Lisp_Object w32_display_name_list; /* Regexp matching a font name whose width is the same as `PIXEL_SIZE'. */ extern Lisp_Object Vx_pixel_size_width_font_regexp; -struct w32_display_info *x_display_info_for_name (); +extern struct frame *x_window_to_frame (struct w32_display_info *, HWND); + +struct w32_display_info *x_display_info_for_name (Lisp_Object); Lisp_Object display_x_get_resource (struct w32_display_info *, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object); -extern struct w32_display_info *w32_term_init (); +extern struct w32_display_info *w32_term_init (Lisp_Object, + char *, char *); extern int x_display_pixel_height (struct w32_display_info *); extern int x_display_pixel_width (struct w32_display_info *); @@ -544,8 +545,10 @@ struct scroll_bar { #define VERTICAL_SCROLL_BAR_WIDTH_TRIM (0) -extern void w32_fill_rect (); -extern void w32_clear_window (); +struct frame; /* from frame.h */ + +extern void w32_fill_rect (struct frame *, HDC, COLORREF, RECT *); +extern void w32_clear_window (struct frame *); #define w32_fill_area(f,hdc,pix,x,y,nx,ny) \ do { \ @@ -645,10 +648,10 @@ typedef struct deferred_msg extern CRITICAL_SECTION critsect; -extern void init_crit (); -extern void delete_crit (); +extern void init_crit (void); +extern void delete_crit (void); -extern void signal_quit (); +extern void signal_quit (void); #define enter_crit() EnterCriticalSection (&critsect) #define leave_crit() LeaveCriticalSection (&critsect) @@ -658,14 +661,13 @@ extern void deselect_palette (struct frame * f, HDC hdc); extern HDC get_frame_dc (struct frame * f); extern int release_frame_dc (struct frame * f, HDC hDC); -extern void drain_message_queue (); +extern void drain_message_queue (void); -extern BOOL get_next_msg (); -extern BOOL post_msg (); +extern BOOL get_next_msg (W32Msg *, BOOL); +extern BOOL post_msg (W32Msg *); extern void complete_deferred_msg (HWND hwnd, UINT msg, LRESULT result); -extern void wait_for_sync (); -extern BOOL parse_button (); +extern BOOL parse_button (int, int, int *, int *); extern void w32_sys_ring_bell (struct frame *f); extern void x_delete_display (struct w32_display_info *dpyinfo); @@ -725,7 +727,7 @@ struct frame * check_x_frame (Lisp_Object); EXFUN (Fx_display_color_p, 1); EXFUN (Fx_display_grayscale_p, 1); -typedef DWORD (WINAPI * ClipboardSequence_Proc) (); +typedef DWORD (WINAPI * ClipboardSequence_Proc) (void); typedef BOOL (WINAPI * AppendMenuW_Proc) ( IN HMENU, IN UINT, -- 2.39.2