* list.h (scm_list_star): deprecation expired - removed.

[bpt/guile.git] / libguile / error.h

diff --git a/libguile/error.h b/libguile/error.h
index 68ddfcd..cfdc604 100644 (file)
--- a/libguile/error.h
+++ b/libguile/error.h
@@ -2,7 +2,7 @@
 
 #ifndef ERRORH
 #define ERRORH
-/*     Copyright (C) 1995,1996 Free Software Foundation, Inc.
+/*     Copyright (C) 1995,1996,1997,1998, 2000 Free Software Foundation, Inc.
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,8 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with this software; see the file COPYING.  If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
  *
  * As a special exception, the Free Software Foundation gives permission
  * for additional uses of the text contained in its release of GUILE.
@@ -40,40 +41,60 @@
  *
  * If you write modifications of your own for GUILE, it is your choice
  * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.  
- */
+ * If you do not wish that, delete this exception notice.  */
 \f
 #include "libguile/__scm.h"
 
 \f
 extern int scm_ints_disabled;
 
-extern SCM scm_system_error_key;
-extern SCM scm_num_overflow_key;
-extern SCM scm_out_of_range_key;
-extern SCM scm_arg_type_key;
-extern SCM scm_args_number_key;
-extern SCM scm_memory_alloc_key;
-extern SCM scm_stack_overflow_key;
-extern SCM scm_misc_error_key;
+\f
+
+/* GCC can be told that a function doesn't return; this helps it do
+   better error checking (for uninitialized variable use, for
+   example), and some optimization.  */
+#ifdef __GNUC__
+#define SCM_NORETURN __attribute__ ((noreturn))
+#else
+#define SCM_NORETURN
+#endif
+
+extern void scm_error (SCM key, const char *subr, const char *message,
+                             SCM args, SCM rest) SCM_NORETURN;
+extern SCM scm_error_scm (SCM key, SCM subr, SCM message,
+                          SCM args, SCM rest) SCM_NORETURN;
+extern SCM scm_strerror (SCM err);
+extern void scm_syserror (const char *subr) SCM_NORETURN;
+extern void scm_syserror_msg (const char *subr, const char *message,
+                              SCM args, int eno) SCM_NORETURN;
+extern void scm_num_overflow (const char *subr) SCM_NORETURN;
+extern void scm_out_of_range (const char *subr, SCM bad_value)
+     SCM_NORETURN;
+extern void scm_out_of_range_pos (const char *subr, SCM bad_value, SCM pos)
+     SCM_NORETURN;
+extern void scm_wrong_num_args (SCM proc) SCM_NORETURN;
+extern void scm_error_num_args_subr (const char* subr) SCM_NORETURN;
+extern void scm_wrong_type_arg (const char *subr, int pos,
+                                SCM bad_value) SCM_NORETURN;
+extern void scm_wrong_type_arg_msg (const char *subr, int pos,
+                                    SCM bad_value, const char *sz) SCM_NORETURN;
+extern void scm_memory_error (const char *subr) SCM_NORETURN;
+extern void scm_misc_error (const char *subr, const char *message,
+                            SCM args) SCM_NORETURN;
+extern void scm_init_error (void);
 
 \f
 
-extern SCM scm_errno SCM_P ((SCM arg));
-extern SCM scm_perror SCM_P ((SCM arg));
-extern void scm_error SCM_P ((SCM key, char *subr, char *message,
-                             SCM args, SCM rest));
-extern void (*scm_error_callback) SCM_P ((SCM key, char *subr,
-                                         char *message, SCM args, SCM rest));
-extern void scm_syserror SCM_P ((char *subr));
-extern void scm_syserror_msg SCM_P ((char *subr, char *message, SCM args));
-extern void scm_sysmissing SCM_P ((char *subr));
-extern void scm_num_overflow SCM_P ((char *subr));
-extern void scm_out_of_range SCM_P ((char *subr, SCM bad_value));
-extern void scm_wrong_num_args SCM_P ((SCM proc));
-extern void scm_wrong_type_arg SCM_P ((char *subr, int pos, SCM bad_value));
-extern void scm_memory_error SCM_P ((char *subr));
-extern SCM scm_wta SCM_P ((SCM arg, char *pos, char *s_subr));
-extern void scm_init_error SCM_P ((void));
+#if (SCM_DEBUG_DEPRECATED == 0)
+
+extern SCM scm_wta (SCM arg, const char *pos, const char *s_subr);
+
+#endif  /* SCM_DEBUG_DEPRECATED == 0 */
 
 #endif  /* ERRORH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/