Remove the need for -Wno-pointer-sign. Object diffs checked.

[bsdgames-darwin.git] / trek / getpar.h

diff --git a/trek/getpar.h b/trek/getpar.h
index 4da3b0710bcc5c03bba97af335cf085bcb67153c..f947215028d442f8fdd7cce890305ef5d502818e 100644 (file)
--- a/trek/getpar.h
+++ b/trek/getpar.h
@@ -1,6 +1,8 @@
+/*     $NetBSD: getpar.h,v 1.12 2009/05/25 00:39:45 dholland Exp $     */
+

 /*
 /*

- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions


@@ -10,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.

- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors

  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *


@@ -30,16 +28,27 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *

- *     @(#)getpar.h    5.4 (Berkeley) 6/1/90
+ *     @(#)getpar.h    8.1 (Berkeley) 5/31/93

  */
 
  */
 

-struct cvntab          /* used for getcodpar() paramater list */
-{
-       char    *abrev;
-       char    *full;
-       int     (*value)();
+typedef void (*cmdfun)(int);
+
+/* used for getcodpar() parameter list */
+struct cvntab {
+       const char      *abbrev;
+       const char      *full;
+       cmdfun  value;

        int     value2;
 };
 
        int     value2;
 };
 

-extern double          getfltpar();
-extern struct cvntab   *getcodpar();
+extern const struct cvntab     Skitab[];
+extern const struct cvntab     Lentab[];
+
+int getintpar(const  char *);
+double getfltpar(const char *);
+int getynpar(const char *);
+const struct cvntab *getcodpar(const char *, const struct cvntab[]);
+void getstrpar(const char *, char *, int, const char *);
+int testnl(void);
+void skiptonl(int);
+int readdelim(int);