summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Scherer <gabriel.scherer@gmail.com>2014-08-06 15:17:07 +0000
committerGabriel Scherer <gabriel.scherer@gmail.com>2014-08-06 15:17:07 +0000
commit97b302a1ce750c5fc1a5bd24283e2a8dbf1fe402 (patch)
tree539ea42fed8b26ea965ec7796ede4a5d179518a9
parentc8efe3409cc5104923c082cbfc1ac163ad1e5b03 (diff)
downloadocaml-97b302a1ce750c5fc1a5bd24283e2a8dbf1fe402.tar.gz
Add missing Noreturn qualifiers
(patch by Peter Zotov, review by Max Mouratov) git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@15057 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r--byterun/extern.c8
-rw-r--r--byterun/misc.c1
-rw-r--r--byterun/misc.h2
-rw-r--r--otherlibs/graph/libgraph.h3
-rw-r--r--yacc/defs.h44
5 files changed, 29 insertions, 29 deletions
diff --git a/byterun/extern.c b/byterun/extern.c
index 33fa89a913..deb8209bad 100644
--- a/byterun/extern.c
+++ b/byterun/extern.c
@@ -75,10 +75,10 @@ static struct extern_item * extern_stack_limit = extern_stack_init
/* Forward declarations */
-static void extern_out_of_memory(void);
-static void extern_invalid_argument(char *msg);
-static void extern_failwith(char *msg);
-static void extern_stack_overflow(void);
+static void extern_out_of_memory(void) Noreturn;
+static void extern_invalid_argument(char *msg) Noreturn;
+static void extern_failwith(char *msg) Noreturn;
+static void extern_stack_overflow(void) Noreturn;
static struct code_fragment * extern_find_code(char *addr);
static void extern_replay_trail(void);
static void free_extern_output(void);
diff --git a/byterun/misc.c b/byterun/misc.c
index 6dc27d5cc3..1872a80acd 100644
--- a/byterun/misc.c
+++ b/byterun/misc.c
@@ -26,7 +26,6 @@ int caml_failed_assert (char * expr, char * file, int line)
file, line, expr);
fflush (stderr);
exit (100);
- return 1; /* not reached */
}
void caml_set_fields (char *bp, unsigned long start, unsigned long filler)
diff --git a/byterun/misc.h b/byterun/misc.h
index 5640980a6f..f7b4fdc24a 100644
--- a/byterun/misc.h
+++ b/byterun/misc.h
@@ -64,7 +64,7 @@ typedef char * addr;
#ifdef DEBUG
#define CAMLassert(x) \
((x) ? (void) 0 : caml_failed_assert ( #x , __FILE__, __LINE__))
-CAMLextern int caml_failed_assert (char *, char *, int);
+CAMLextern int caml_failed_assert (char *, char *, int) Noreturn;
#else
#define CAMLassert(x) ((void) 0)
#endif
diff --git a/otherlibs/graph/libgraph.h b/otherlibs/graph/libgraph.h
index e75ee801cc..71204e3133 100644
--- a/otherlibs/graph/libgraph.h
+++ b/otherlibs/graph/libgraph.h
@@ -15,6 +15,7 @@
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <mlvalues.h>
+#include <misc.h>
struct canvas {
int w, h; /* Dimensions of the drawable */
@@ -73,7 +74,7 @@ extern int caml_gr_bits_per_pixel;
#endif
#endif
-extern void caml_gr_fail(char *fmt, char *arg);
+extern void caml_gr_fail(char *fmt, char *arg) Noreturn;
extern void caml_gr_check_open(void);
extern unsigned long caml_gr_pixel_rgb(int rgb);
extern int caml_gr_rgb_pixel(long unsigned int pixel);
diff --git a/yacc/defs.h b/yacc/defs.h
index 0a823874f6..32114ea568 100644
--- a/yacc/defs.h
+++ b/yacc/defs.h
@@ -312,45 +312,45 @@ extern action *add_reductions(int stateno, register action *actions);
extern action *add_reduce(register action *actions, register int ruleno, register int symbol);
extern void closure (short int *nucleus, int n);
extern void create_symbol_table (void);
-extern void default_action_error (void);
+extern void default_action_error (void) Noreturn;
extern void done (int k) Noreturn;
-extern void entry_without_type (char *s);
-extern void fatal (char *msg);
+extern void entry_without_type (char *s) Noreturn;
+extern void fatal (char *msg) Noreturn;
extern void finalize_closure (void);
extern void free_parser (void);
extern void free_symbol_table (void);
extern void free_symbols (void);
-extern void illegal_character (char *c_cptr);
-extern void illegal_token_ref (int i, char *name);
+extern void illegal_character (char *c_cptr) Noreturn;
+extern void illegal_token_ref (int i, char *name) Noreturn;
extern void lalr (void);
extern void lr0 (void);
extern void make_parser (void);
-extern void no_grammar (void);
-extern void no_space (void);
-extern void open_error (char *filename);
+extern void no_grammar (void) Noreturn;
+extern void no_space (void) Noreturn;
+extern void open_error (char *filename) Noreturn;
extern void output (void);
-extern void over_unionized (char *u_cptr);
+extern void over_unionized (char *u_cptr) Noreturn;
extern void prec_redeclared (void);
-extern void polymorphic_entry_point(char *s);
+extern void polymorphic_entry_point(char *s) Noreturn;
extern void reader (void);
extern void reflexive_transitive_closure (unsigned int *R, int n);
extern void reprec_warning (char *s);
extern void retyped_warning (char *s);
extern void revalued_warning (char *s);
extern void set_first_derives (void);
-extern void syntax_error (int st_lineno, char *st_line, char *st_cptr) Noreturn, terminal_lhs (int s_lineno);
-extern void terminal_start (char *s);
-extern void tokenized_start (char *s);
-extern void too_many_entries (void);
+extern void syntax_error (int st_lineno, char *st_line, char *st_cptr) Noreturn, terminal_lhs (int s_lineno) Noreturn;
+extern void terminal_start (char *s) Noreturn;
+extern void tokenized_start (char *s) Noreturn;
+extern void too_many_entries (void) Noreturn;
extern void undefined_goal (char *s);
extern void undefined_symbol (char *s);
-extern void unexpected_EOF (void);
-extern void unknown_rhs (int i);
-extern void unterminated_action (int a_lineno, char *a_line, char *a_cptr);
-extern void unterminated_comment (int c_lineno, char *c_line, char *c_cptr);
-extern void unterminated_string (int s_lineno, char *s_line, char *s_cptr);
-extern void unterminated_text (int t_lineno, char *t_line, char *t_cptr);
-extern void unterminated_union (int u_lineno, char *u_line, char *u_cptr);
-extern void used_reserved (char *s);
+extern void unexpected_EOF (void) Noreturn;
+extern void unknown_rhs (int i) Noreturn;
+extern void unterminated_action (int a_lineno, char *a_line, char *a_cptr) Noreturn;
+extern void unterminated_comment (int c_lineno, char *c_line, char *c_cptr) Noreturn;
+extern void unterminated_string (int s_lineno, char *s_line, char *s_cptr) Noreturn;
+extern void unterminated_text (int t_lineno, char *t_line, char *t_cptr) Noreturn;
+extern void unterminated_union (int u_lineno, char *u_line, char *u_cptr) Noreturn;
+extern void used_reserved (char *s) Noreturn;
extern void verbose (void);
extern void write_section (char **section);