Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/games/dab Fix various format string mismatches.



details:   https://anonhg.NetBSD.org/src/rev/e8d56bed0b64
branches:  trunk
changeset: 777685:e8d56bed0b64
user:      joerg <joerg%NetBSD.org@localhost>
date:      Wed Feb 29 23:39:53 2012 +0000

description:
Fix various format string mismatches.

diffstat:

 games/dab/algor.cc |  14 +++++++-------
 games/dab/board.h  |   5 +++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diffs (82 lines):

diff -r b4684b5c8327 -r e8d56bed0b64 games/dab/algor.cc
--- a/games/dab/algor.cc        Wed Feb 29 23:38:46 2012 +0000
+++ b/games/dab/algor.cc        Wed Feb 29 23:39:53 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: algor.cc,v 1.4 2008/04/28 20:22:53 martin Exp $        */
+/*     $NetBSD: algor.cc,v 1.5 2012/02/29 23:39:53 joerg Exp $ */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
  * algor.C: Computer algorithm
  */
 #include "defs.h"
-RCSID("$NetBSD: algor.cc,v 1.4 2008/04/28 20:22:53 martin Exp $")
+RCSID("$NetBSD: algor.cc,v 1.5 2012/02/29 23:39:53 joerg Exp $")
 
 #include "algor.h"
 #include "board.h"
@@ -65,7 +65,7 @@
                for (dir = BOX::first; dir < BOX::last; dir++)
                    if (!box.isset(dir))
                        return 1;
-               b.abort("find_closure: 3 sided box[%d,%d] has no free sides",
+               b.abort("find_closure: 3 sided box[%zu,%zu] has no free sides",
                        y, x);
            }
        }
@@ -112,7 +112,7 @@
            dir = tdir;
        }
        if ((mv = b.domove(ty, tx, tdir, getWho())) == -1)
-           b.abort("count_closure: Invalid move (%d, %d, %d)", y, x, dir);
+           b.abort("count_closure: Invalid move (%zu, %zu, %d)", y, x, dir);
        else
            i += mv;
     }
@@ -157,7 +157,7 @@
 {
     // Sanity check; we must have a good box
     if (box.count() >= 2)
-       b.abort("try_good_turn: box[%d,%d] has more than 2 sides occupied",
+       b.abort("try_good_turn: box[%zu,%zu] has more than 2 sides occupied",
                y, x);
 
     // Make sure we don't make a closure in an adjacent box.
@@ -203,7 +203,7 @@
                        int last)
 {
     if (4 - box.count() <= last)
-       b.abort("try_bad_turn: Called at [%d,%d] for %d with %d",
+       b.abort("try_bad_turn: Called at [%zu,%zu] for %d with %d",
                y, x, last, box.count());
     for (dir = BOX::first; dir < BOX::last; dir++)
        if (!box.isset(dir)) {
@@ -246,7 +246,7 @@
 
         // Play a bad move that would cause the opponent's closure
        if ((mv = nb.domove(ty, tx, tdir, getWho())) != 0)
-           b.abort("find_min_closure1: Invalid move %d (%d, %d, %d)", mv,
+           b.abort("find_min_closure1: Invalid move %d (%zu, %zu, %d)", mv,
                    ty, tx, tdir);
 
         // Count the opponent's closure
diff -r b4684b5c8327 -r e8d56bed0b64 games/dab/board.h
--- a/games/dab/board.h Wed Feb 29 23:38:46 2012 +0000
+++ b/games/dab/board.h Wed Feb 29 23:39:53 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: board.h,v 1.3 2011/08/29 20:30:37 joerg Exp $  */
+/*     $NetBSD: board.h,v 1.4 2012/02/29 23:39:53 joerg Exp $  */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -72,7 +72,8 @@
     void games(size_t i, const PLAYER& p);             // Post games
     void total(size_t i, const PLAYER& p);             // Post totals
     void ties(const PLAYER& p);                                // Post ties
-    __dead void abort(const char *s, ...) const;       // Algorithm error
+    __printflike(2, 3) __dead
+    void abort(const char *s, ...) const;              // Algorithm error
 
 
   private:



Home | Main Index | Thread Index | Old Index