Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix various format string mismatches.

This commit is contained in:
joerg 2012-02-29 23:39:53 +00:00
parent f05babd200
commit 202d44a492
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
games/dab/algor.cc
View File

@ -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

5
games/dab/board.h
View File

@ -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: