cgram: adjust style to survive lint's strict bool mode

[bsdgames-darwin.git] / mille / varpush.c

diff --git a/mille/varpush.c b/mille/varpush.c
index ec1205473b15d686e2347049301255b5bb0aa982..319637459089e78eef4a6cc891ae31ee3237a797 100644 (file)
--- a/mille/varpush.c
+++ b/mille/varpush.c
@@ -1,3 +1,5 @@
+/*     $NetBSD: varpush.c,v 1.13 2016/06/05 18:39:02 christos Exp $    */
+
 /*
  * Copyright (c) 1982, 1993
  *     The Regents of the University of California.  All rights reserved.
@@ -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.
- * 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.
  *
@@ -31,63 +29,78 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-/*static char sccsid[] = "from: @(#)varpush.c  8.1 (Berkeley) 5/31/93";*/
-static char rcsid[] = "$Id: varpush.c,v 1.3 1994/05/12 17:39:45 jtc Exp $";
+#if 0
+static char sccsid[] = "@(#)varpush.c  8.1 (Berkeley) 5/31/93";
+#else
+__RCSID("$NetBSD: varpush.c,v 1.13 2016/06/05 18:39:02 christos Exp $");
+#endif
 #endif /* not lint */
 
-# include      <paths.h>
-# include      "mille.h"
+#include <paths.h>
+#include "mille.h"
 
 /*
  * @(#)varpush.c       1.1 (Berkeley) 4/1/82
  */
 
-int    read(), write();
-
 /*
  *     push variables around via the routine func() on the file
  * channel file.  func() is either read or write.
  */
-varpush(file, func)
-reg int        file;
-reg int        (*func)(); {
-
-       int     temp;
+bool
+varpush(int file, ssize_t (*func)(int, const struct iovec *, int))
+{
+       int             temp;
+       const struct iovec vec[] = {
+               { (void *) &Debug, sizeof Debug },
+               { (void *) &Finished, sizeof Finished },
+               { (void *) &Order, sizeof Order },
+               { (void *) &End, sizeof End },
+               { (void *) &On_exit, sizeof On_exit },
+               { (void *) &Handstart, sizeof Handstart },
+               { (void *) &Numgos, sizeof Numgos },
+               { (void *) Numseen, sizeof Numseen },
+               { (void *) &Play, sizeof Play },
+               { (void *) &Window, sizeof Window },
+               { (void *) Deck, sizeof Deck },
+               { (void *) &Discard, sizeof Discard },
+               { (void *) Player, sizeof Player }
+       };
 
-       (*func)(file, (char *) &Debug, sizeof Debug);
-       (*func)(file, (char *) &Finished, sizeof Finished);
-       (*func)(file, (char *) &Order, sizeof Order);
-       (*func)(file, (char *) &End, sizeof End);
-       (*func)(file, (char *) &On_exit, sizeof On_exit);
-       (*func)(file, (char *) &Handstart, sizeof Handstart);
-       (*func)(file, (char *) &Numgos, sizeof Numgos);
-       (*func)(file, (char *)  Numseen, sizeof Numseen);
-       (*func)(file, (char *) &Play, sizeof Play);
-       (*func)(file, (char *) &Window, sizeof Window);
-       (*func)(file, (char *)  Deck, sizeof Deck);
-       (*func)(file, (char *) &Discard, sizeof Discard);
-       (*func)(file, (char *)  Player, sizeof Player);
-       if (func == read) {
-               read(file, (char *) &temp, sizeof temp);
+       if (((func)(file, vec, sizeof(vec) / sizeof(vec[0]))) < 0) {
+               error("%s", strerror(errno));
+               return FALSE;
+       }
+       if (func == readv) {
+               if ((read(file, (void *) &temp, sizeof temp)) < 0) {
+                       error("%s", strerror(errno));
+                       return FALSE;
+               }
                Topcard = &Deck[temp];
 #ifdef DEBUG
                if (Debug) {
-                       char    buf[80];
+                       char    buf[80], *bp;
 over:
                        printf("Debug file:");
-                       gets(buf);
+                       fgets(buf, (int)sizeof(buf), stdin);
+                       if ((bp = strchr(buf, '\n')) != NULL)
+                               *bp = '\0';
                        if ((outf = fopen(buf, "w")) == NULL) {
-                               perror(buf);
+                               warn("%s", buf);
                                goto over;
                        }
                        if (strcmp(buf, _PATH_DEVNULL) != 0)
-                               setbuf(outf, (char *)NULL);
+                               setbuf(outf, NULL);
                }
 #endif
-       }
-       else {
+       } else {
                temp = Topcard - Deck;
-               write(file, (char *) &temp, sizeof temp);
+               if ((write(file, (void *) &temp, sizeof temp)) < 0) {
+                       error("%s", strerror(errno));
+                       return FALSE;
+               }
        }
+       return TRUE;
 }