Remove unreachable code in scm_setter

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

diff --git a/libguile/options.h b/libguile/options.h
dissimilarity index 90%
index 2a7ead5..8ea960b 100644 (file)
--- a/libguile/options.h
+++ b/libguile/options.h
@@ -1,71 +1,55 @@
-/* classes: h_files */
-
-#ifndef OPTIONSH
-#define OPTIONSH
-/*     Copyright (C) 1995,1996 Free Software Foundation
- * 
- * 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
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * 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.
- *
- * As a special exception, the Free Software Foundation gives permission
- * for additional uses of the text contained in its release of GUILE.
- *
- * The exception is that, if you link the GUILE library with other files
- * to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the GUILE library code into it.
- *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
- *
- * This exception applies only to the code released by the
- * Free Software Foundation under the name GUILE.  If you copy
- * code from other Free Software Foundation releases into a copy of
- * GUILE, as the General Public License permits, the exception does
- * not apply to the code that you add in this way.  To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
- *
- * 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.
- *
- * The author can be reached at djurfeldt@nada.kth.se
- * Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN
- */
-\f
-
-#include "libguile/__scm.h"
-
-\f
-
-typedef struct scm_option
-{
-  int type;
-  char *name;
-  unsigned long val;
-  char *doc;
-} scm_option;
-
-#define SCM_OPTION_BOOLEAN 0
-#define SCM_OPTION_INTEGER 1
-#define SCM_OPTION_SCM     2
-
-
-extern SCM scm_options SCM_P ((SCM new_mode, scm_option options[], int n, char *s));
-extern void scm_init_opts SCM_P ((SCM (*func) (SCM), scm_option options[], int n));
-extern void scm_init_options SCM_P ((void));
-
-#endif /* OPTIONSH */
+/* classes: h_files */
+
+#ifndef SCM_OPTIONS_H
+#define SCM_OPTIONS_H
+
+/* Copyright (C) 1995,1996,2000,2001, 2006, 2008 Free Software Foundation, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
+\f
+
+#include "libguile/__scm.h"
+
+\f
+
+typedef struct scm_t_option
+{
+  unsigned int type;
+  const char *name;
+  scm_t_bits val;
+  char *doc;
+} scm_t_option;
+
+
+#define SCM_OPTION_BOOLEAN 0
+#define SCM_OPTION_INTEGER 1
+#define SCM_OPTION_SCM     2
+
+
+SCM_API SCM scm_options_try (SCM args, scm_t_option options[], const char *s, int dry_run);
+SCM_API SCM scm_options (SCM, scm_t_option [], const char*);
+SCM_API void scm_init_opts (SCM (*) (SCM), scm_t_option []);
+SCM_INTERNAL void scm_init_options (void);
+
+#endif  /* SCM_OPTIONS_H */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/