diff options
| author |   joerg <joerg@NetBSD.org> | 2012-02-29 23:39:53 +0000 |
|---|---|---|
| committer | joerg <joerg@NetBSD.org> | 2012-02-29 23:39:53 +0000 |
| commit | 4749c0f9e18f87c21e43a65ffbf2d9c08ecf7a3a (patch) | |
| tree | 066a98ba3c73e8926381349dfb82631b59dc6325 /dab | |
| parent | bcbc46f191b73fe1b817d448571b248466e49272 (diff) | |
| download | bsdgames-darwin-4749c0f9e18f87c21e43a65ffbf2d9c08ecf7a3a.tar.gz bsdgames-darwin-4749c0f9e18f87c21e43a65ffbf2d9c08ecf7a3a.tar.zst bsdgames-darwin-4749c0f9e18f87c21e43a65ffbf2d9c08ecf7a3a.zip | |
Fix various format string mismatches.
Diffstat (limited to 'dab')
| -rw-r--r-- | dab/algor.cc | 14 | ||||
| -rw-r--r-- | dab/board.h | 5 |
2 files changed, 10 insertions, 9 deletions
diff --git a/dab/algor.cc b/dab/algor.cc index ce22a1f2..86fc6e1c 100644 --- a/dab/algor.cc +++ b/dab/algor.cc @@ -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 @@ int ALGOR::find_closure(size_t& y, size_t& x, int& dir, BOARD& b) 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 @@ size_t ALGOR::count_closure(size_t& y, size_t& x, int& dir, BOARD& b) 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 @@ int ALGOR::try_good_turn(BOX& box, size_t y, size_t x, int& dir, BOARD& b) { // 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 ALGOR::try_bad_turn(BOX& box, size_t& y, size_t& x, int& dir, BOARD& b, 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 @@ size_t ALGOR::find_min_closure1(size_t& y, size_t& x, int& dir, const BOARD& b, // 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 --git a/dab/board.h b/dab/board.h index 2470703c..67dc3e0a 100644 --- a/dab/board.h +++ b/dab/board.h @@ -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 @@ class BOARD { 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: |