diff options
| author | Dan Nicolaescu | 2006-05-29 08:06:15 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2006-05-29 08:06:15 +0000 |
| commit | 01d0930532c2fbcf249a4dfa36e8365090e109e7 (patch) | |
| tree | 55d91d6cc45f686767e962518d99324b768eceff | |
| parent | 3fc7a865c4399c2ae64b10d5c0a35d6fe08d7de5 (diff) | |
| download | emacs-01d0930532c2fbcf249a4dfa36e8365090e109e7.tar.gz emacs-01d0930532c2fbcf249a4dfa36e8365090e109e7.zip | |
* 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.
| -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 @@ | |||
| 1 | 2006-05-29 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * search.c (matcher_overflow): Mark as NO_RETURN. | ||
| 4 | |||
| 5 | * xterm.c (x_connection_closed): Likewise. | ||
| 6 | |||
| 7 | * sysdep.c (croak): Likewise. | ||
| 8 | |||
| 9 | * sound.c (sound_perror, alsa_sound_perror): Likewise. | ||
| 10 | |||
| 11 | * lisp.h (die, nsberror): Likewise. | ||
| 12 | |||
| 1 | 2006-05-29 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> | 13 | 2006-05-29 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> |
| 2 | 14 | ||
| 3 | * sound.c (alsa_open, alsa_configure, alsa_write): Move | 15 | * 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. */ | |||
| 80 | 80 | ||
| 81 | /* Extra internal type checking? */ | 81 | /* Extra internal type checking? */ |
| 82 | extern int suppress_checking; | 82 | extern int suppress_checking; |
| 83 | extern void die P_((const char *, const char *, int)); | 83 | extern void die P_((const char *, const char *, int)) NO_RETURN; |
| 84 | 84 | ||
| 85 | #ifdef ENABLE_CHECKING | 85 | #ifdef ENABLE_CHECKING |
| 86 | 86 | ||
| @@ -2780,7 +2780,7 @@ extern void set_time_zone_rule P_ ((char *)); | |||
| 2780 | 2780 | ||
| 2781 | /* defined in buffer.c */ | 2781 | /* defined in buffer.c */ |
| 2782 | extern int mouse_face_overlay_overlaps P_ ((Lisp_Object)); | 2782 | extern int mouse_face_overlay_overlaps P_ ((Lisp_Object)); |
| 2783 | extern void nsberror P_ ((Lisp_Object)); | 2783 | extern void nsberror P_ ((Lisp_Object)) NO_RETURN; |
| 2784 | extern char *no_switch_window P_ ((Lisp_Object window)); | 2784 | extern char *no_switch_window P_ ((Lisp_Object window)); |
| 2785 | EXFUN (Fset_buffer_multibyte, 1); | 2785 | EXFUN (Fset_buffer_multibyte, 1); |
| 2786 | EXFUN (Foverlay_start, 1); | 2786 | 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 (); | |||
| 90 | static int simple_search (); | 90 | static int simple_search (); |
| 91 | static int boyer_moore (); | 91 | static int boyer_moore (); |
| 92 | static int search_buffer (); | 92 | static int search_buffer (); |
| 93 | static void matcher_overflow () NO_RETURN; | ||
| 93 | 94 | ||
| 94 | static void | 95 | static void |
| 95 | matcher_overflow () | 96 | 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 | |||
| 113 | SOUND_ATTR_SENTINEL | 113 | SOUND_ATTR_SENTINEL |
| 114 | }; | 114 | }; |
| 115 | 115 | ||
| 116 | static void sound_perror P_ ((char *)); | 116 | static void alsa_sound_perror P_ ((char *, int)) NO_RETURN; |
| 117 | static void sound_perror P_ ((char *)) NO_RETURN; | ||
| 117 | static void sound_warning P_ ((char *)); | 118 | static void sound_warning P_ ((char *)); |
| 118 | static int parse_sound P_ ((Lisp_Object, Lisp_Object *)); | 119 | static int parse_sound P_ ((Lisp_Object, Lisp_Object *)); |
| 119 | 120 | ||
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; | |||
| 244 | under VMS, we place the input channel number here. */ | 244 | under VMS, we place the input channel number here. */ |
| 245 | int input_fd; | 245 | int input_fd; |
| 246 | 246 | ||
| 247 | void croak P_ ((char *)); | 247 | void croak P_ ((char *)) NO_RETURN; |
| 248 | 248 | ||
| 249 | #ifdef AIXHFT | 249 | #ifdef AIXHFT |
| 250 | void hft_init (); | 250 | 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 *)); | |||
| 357 | static void x_check_expected_move P_ ((struct frame *)); | 357 | static void x_check_expected_move P_ ((struct frame *)); |
| 358 | static int handle_one_xevent P_ ((struct x_display_info *, XEvent *, | 358 | static int handle_one_xevent P_ ((struct x_display_info *, XEvent *, |
| 359 | int *, struct input_event *)); | 359 | int *, struct input_event *)); |
| 360 | static SIGTYPE x_connection_closed P_ ((Display *, char *)); | ||
| 360 | 361 | ||
| 361 | 362 | ||
| 362 | /* Flush display of frame F, or of all frames if F is null. */ | 363 | /* Flush display of frame F, or of all frames if F is null. */ |