From 2381d38d0af85e3a97eb9f98c66a7259a2a3e1e1 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Tue, 18 Jul 2006 16:33:45 +0000 Subject: [PATCH] * ebrowse.c (usage, version): Mark as NO_RETURN. * emacsclient.c (print_help_and_exit): Likewise. * xterm.c (x_connection_closed, x_error_quitter): Mark as NO_RETURN. * textprop.c (text_read_only): Likewise. * lread.c (end_of_file_error): Likewise. * lisp.h (circular_list_error, memory_full, buffer_memory_full): Likewise. * eval.c (unwind_to_catch): Likewise. * buffer.h (buffer_slot_type_mismatch): Likewise. --- lib-src/ChangeLog | 6 ++++++ lib-src/ebrowse.c | 2 ++ lib-src/emacsclient.c | 2 +- src/ChangeLog | 15 +++++++++++++++ src/buffer.h | 2 +- src/eval.c | 1 + src/lisp.h | 6 +++--- src/lread.c | 1 + src/textprop.c | 2 ++ src/xterm.c | 4 ++-- 10 files changed, 34 insertions(+), 7 deletions(-) diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index e792753b74..9468767072 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,9 @@ +2006-07-18 Dan Nicolaescu + + * ebrowse.c (usage, version): Mark as NO_RETURN. + + * emacsclient.c (print_help_and_exit): Likewise. + 2006-07-10 Francesco Potort,Al(B * etags.c (absolute_filename): Free unused space (cosmetic change). diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c index 398dd10896..1880f1655e 100644 --- a/lib-src/ebrowse.c +++ b/lib-src/ebrowse.c @@ -533,6 +533,8 @@ struct sym *parse_qualified_ident_or_type P_ ((char **)); void parse_qualified_param_ident_or_type P_ ((char **)); int globals P_ ((int)); void yyerror P_ ((char *, char *)); +void usage P_ ((int)) NO_RETURN; +void version P_ (()) NO_RETURN; diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 46cb7ec2ae..b0bf50c2c7 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -67,7 +67,7 @@ const char * alternate_editor = NULL; /* If non-NULL, the filename of the UNIX socket. */ char *socket_name = NULL; -void print_help_and_exit (); +void print_help_and_exit () NO_RETURN; struct option longopts[] = { diff --git a/src/ChangeLog b/src/ChangeLog index 67d26d13f9..41b3f92a4c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,18 @@ +2006-07-18 Dan Nicolaescu + + * xterm.c (x_connection_closed, x_error_quitter): Mark as NO_RETURN. + + * textprop.c (text_read_only): Likewise. + + * lread.c (end_of_file_error): Likewise. + + * lisp.h (circular_list_error, memory_full, buffer_memory_full): + Likewise. + + * eval.c (unwind_to_catch): Likewise. + + * buffer.h (buffer_slot_type_mismatch): Likewise. + 2006-07-18 Kim F. Storm Cleanup Fsignal calls that never returns; now only use it for Qquit. diff --git a/src/buffer.h b/src/buffer.h index 60aa3e7aae..efe0252453 100644 --- a/src/buffer.h +++ b/src/buffer.h @@ -833,7 +833,7 @@ extern void set_buffer_internal P_ ((struct buffer *)); extern void set_buffer_internal_1 P_ ((struct buffer *)); extern void set_buffer_temp P_ ((struct buffer *)); extern void record_buffer P_ ((Lisp_Object)); -extern void buffer_slot_type_mismatch P_ ((int)); +extern void buffer_slot_type_mismatch P_ ((int)) NO_RETURN; extern void fix_overlays_before P_ ((struct buffer *, EMACS_INT, EMACS_INT)); extern void mmap_set_vars P_ ((int)); diff --git a/src/eval.c b/src/eval.c index 37c245234f..0d7a6a3103 100644 --- a/src/eval.c +++ b/src/eval.c @@ -198,6 +198,7 @@ Lisp_Object Vmacro_declaration_function; extern Lisp_Object Qrisky_local_variable; static Lisp_Object funcall_lambda P_ ((Lisp_Object, int, Lisp_Object*)); +static void unwind_to_catch P_ ((struct catchtag *, Lisp_Object)) NO_RETURN; void init_eval_once () diff --git a/src/lisp.h b/src/lisp.h index 8d9e2b7cfa..d1ce953cd6 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -2174,7 +2174,7 @@ extern Lisp_Object Qnumberp, Qnumber_or_marker_p; extern Lisp_Object Qinteger; -extern void circular_list_error P_ ((Lisp_Object)); +extern void circular_list_error P_ ((Lisp_Object)) NO_RETURN; EXFUN (Finteractive_form, 1); /* Defined in frame.c */ @@ -2549,8 +2549,8 @@ extern void allocate_string_data P_ ((struct Lisp_String *, int, int)); extern void reset_malloc_hooks P_ ((void)); extern void uninterrupt_malloc P_ ((void)); extern void malloc_warning P_ ((char *)); -extern void memory_full P_ ((void)); -extern void buffer_memory_full P_ ((void)); +extern void memory_full P_ ((void)) NO_RETURN; +extern void buffer_memory_full P_ ((void)) NO_RETURN; extern int survives_gc_p P_ ((Lisp_Object)); extern void mark_object P_ ((Lisp_Object)); extern Lisp_Object Vpurify_flag; diff --git a/src/lread.c b/src/lread.c index c407b5947d..88a70f691c 100644 --- a/src/lread.c +++ b/src/lread.c @@ -215,6 +215,7 @@ static Lisp_Object load_unwind P_ ((Lisp_Object)); static Lisp_Object load_descriptor_unwind P_ ((Lisp_Object)); static void invalid_syntax P_ ((const char *, int)) NO_RETURN; +static void end_of_file_error P_ (()) NO_RETURN; /* Handle unreading and rereading of characters. diff --git a/src/textprop.c b/src/textprop.c index b89d73a7ef..fd70f039d2 100644 --- a/src/textprop.c +++ b/src/textprop.c @@ -78,6 +78,8 @@ Lisp_Object Vtext_property_default_nonsticky; Lisp_Object interval_insert_behind_hooks; Lisp_Object interval_insert_in_front_hooks; +static void text_read_only P_ ((Lisp_Object)) NO_RETURN; + /* Signal a `text-read-only' error. This function makes it easier to capture that error in GDB by putting a breakpoint on it. */ diff --git a/src/xterm.c b/src/xterm.c index 0b16a37a62..5e4eeb3bb6 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -358,7 +358,7 @@ static void x_check_expected_move P_ ((struct frame *, int, int)); static void x_sync_with_move P_ ((struct frame *, int, int, int)); static int handle_one_xevent P_ ((struct x_display_info *, XEvent *, int *, struct input_event *)); -static SIGTYPE x_connection_closed P_ ((Display *, char *)); +static SIGTYPE x_connection_closed P_ ((Display *, char *)) NO_RETURN; /* Flush display of frame F, or of all frames if F is null. */ @@ -7771,7 +7771,7 @@ x_connection_closed (dpy, error_message) /* We specifically use it before defining it, so that gcc doesn't inline it, otherwise gdb doesn't know how to properly put a breakpoint on it. */ -static void x_error_quitter (Display *display, XErrorEvent *error); +static void x_error_quitter P_ ((Display *, XErrorEvent *)) NO_RETURN; /* This is the first-level handler for X protocol errors. It calls x_error_quitter or x_error_catcher. */ -- 2.39.2