BSD 4_3_Tahoe release

[unix-history] / usr / src / games / cribbage / score.c

diff --git a/usr/src/games/cribbage/score.c b/usr/src/games/cribbage/score.c
index ff8c942..ae56a28 100644 (file)
--- a/usr/src/games/cribbage/score.c
+++ b/usr/src/games/cribbage/score.c
@@ -1,12 +1,23 @@
 /*
  * Copyright (c) 1980 Regents of the University of California.
 /*
  * Copyright (c) 1980 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)score.c    5.1 (Berkeley) 5/30/85";
-#endif not lint
+static char sccsid[] = "@(#)score.c    5.4 (Berkeley) 6/18/88";
+#endif /* not lint */

 
 #include       <stdio.h>
 #include       "deck.h"
 
 #include       <stdio.h>
 #include       "deck.h"


@@ -125,7 +136,7 @@ BOOLEAN                     do_explain;     /* true if must explain this hand */
        score += i;
        if (do_explain)
            if (i > 0) {
        score += i;
        if (do_explain)
            if (i > 0) {

-               sprintf(buf, "%d points in fifteens", i);
+               (void)sprintf(buf, "%d points in fifteens", i);

                strcat(expl, buf);
            }
            else
                strcat(expl, buf);
            }
            else


@@ -134,8 +145,8 @@ BOOLEAN                     do_explain;     /* true if must explain this hand */
        score += i;
        if (do_explain)
            if (i > 0) {
        score += i;
        if (do_explain)
            if (i > 0) {

-               sprintf(buf, ", %d points in pairs, %d in runs", pairpoints,
-                   runpoints);
+               (void)sprintf(buf, ", %d points in pairs, %d in runs",
+                       pairpoints, runpoints);

                strcat(expl, buf);
            }
            else
                strcat(expl, buf);
            }
            else