diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2006-05-29 08:06:15 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2006-05-29 08:06:15 +0000 |
| commit | 01d0930532c2fbcf249a4dfa36e8365090e109e7 (patch) | |
| tree | 55d91d6cc45f686767e962518d99324b768eceff /src | |
| parent | 3fc7a865c4399c2ae64b10d5c0a35d6fe08d7de5 (diff) | |
| download | emacs-01d0930532c2fbcf249a4dfa36e8365090e109e7.tar.gz | |
* search.c (matcher_overflow): Mark as NO_RETURN.
* xterm.c (x_connection_closed): Likewise.
* sysdep.c (croak): Likewise.
* sound.c (sound_perror, alsa_sound_perror): Likewise.
* lisp.h (die, nsberror): Likewise.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 12 | ||||
| -rw-r--r-- | src/lisp.h | 4 | ||||
| -rw-r--r-- | src/search.c | 1 | ||||
| -rw-r--r-- | src/sound.c | 3 | ||||
| -rw-r--r-- | src/sysdep.c | 2 | ||||
| -rw-r--r-- | src/xterm.c | 1 |
6 files changed, 19 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 49d3355f201..8d7c9bd09fb 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,15 @@ +2006-05-29 Dan Nicolaescu <dann@ics.uci.edu> + + * search.c (matcher_overflow): Mark as NO_RETURN. + + * xterm.c (x_connection_closed): Likewise. + + * sysdep.c (croak): Likewise. + + * sound.c (sound_perror, alsa_sound_perror): Likewise. + + * lisp.h (die, nsberror): Likewise. + 2006-05-29 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> * sound.c (alsa_open, alsa_configure, alsa_write): Move diff --git a/src/lisp.h b/src/lisp.h index e606024ea90..400dc8d639a 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -80,7 +80,7 @@ Boston, MA 02110-1301, USA. */ /* Extra internal type checking? */ extern int suppress_checking; -extern void die P_((const char *, const char *, int)); +extern void die P_((const char *, const char *, int)) NO_RETURN; #ifdef ENABLE_CHECKING @@ -2780,7 +2780,7 @@ extern void set_time_zone_rule P_ ((char *)); /* defined in buffer.c */ extern int mouse_face_overlay_overlaps P_ ((Lisp_Object)); -extern void nsberror P_ ((Lisp_Object)); +extern void nsberror P_ ((Lisp_Object)) NO_RETURN; extern char *no_switch_window P_ ((Lisp_Object window)); EXFUN (Fset_buffer_multibyte, 1); EXFUN (Foverlay_start, 1); diff --git a/src/search.c b/src/search.c index dfbf66fc7ed..99db7f184fc 100644 --- a/src/search.c +++ b/src/search.c @@ -90,6 +90,7 @@ static void save_search_regs (); static int simple_search (); static int boyer_moore (); static int search_buffer (); +static void matcher_overflow () NO_RETURN; static void matcher_overflow () diff --git a/src/sound.c b/src/sound.c index c512ca45864..af2369040cc 100644 --- a/src/sound.c +++ b/src/sound.c @@ -113,7 +113,8 @@ enum sound_attr SOUND_ATTR_SENTINEL }; -static void sound_perror P_ ((char *)); +static void alsa_sound_perror P_ ((char *, int)) NO_RETURN; +static void sound_perror P_ ((char *)) NO_RETURN; static void sound_warning P_ ((char *)); static int parse_sound P_ ((Lisp_Object, Lisp_Object *)); diff --git a/src/sysdep.c b/src/sysdep.c index 3e06170e721..307f69290d6 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -244,7 +244,7 @@ int emacs_ospeed; under VMS, we place the input channel number here. */ int input_fd; -void croak P_ ((char *)); +void croak P_ ((char *)) NO_RETURN; #ifdef AIXHFT void hft_init (); diff --git a/src/xterm.c b/src/xterm.c index 6624fa79df1..343ca30caa9 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -357,6 +357,7 @@ static void x_check_fullscreen P_ ((struct frame *)); static void x_check_expected_move P_ ((struct frame *)); static int handle_one_xevent P_ ((struct x_display_info *, XEvent *, int *, struct input_event *)); +static SIGTYPE x_connection_closed P_ ((Display *, char *)); /* Flush display of frame F, or of all frames if F is null. */ |