empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(verify_fail): New.

Browse source 
(verify_row): Use it.
This commit is contained in:
Markus Armbruster 2006-02-19 17:08:35 +00:00
parent 6bd0eabb21
commit 9559abb506
1 changed files with 37 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

61
src/lib/common/ef_verify.c
View file

@ -33,13 +33,34 @@
#include <config.h> #include <config.h>
#include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <time.h>
#include "prototypes.h" #include "prototypes.h"
#include "file.h" #include "file.h"
#include "nsc.h" #include "nsc.h"
static void verify_fail(int, int, struct castr *, char *, ...)
ATTRIBUTE((format (printf, 4, 5)));
static void
verify_fail(int type, int row, struct castr *ca, char *fmt, ...)
{
int i;
va_list ap;
/* Find base table of view, if any */
for (i = 0; empfile[i].cache == empfile[type].cache; i++) ;
fprintf(stderr, "%s %s uid %d field %s: ",
EF_IS_GAME_STATE(i) ? "File" : "Config",
ef_nameof(type), row, ca->ca_name);
va_start(ap, fmt);
vfprintf(stderr, fmt, ap);
va_end(ap);
putc('\n', stderr);
}
static int static int
verify_row(int type, int row) verify_row(int type, int row)
{ {
@ -84,22 +105,20 @@ verify_row(int type, int row)
} }
for (k = 0; k < (int)sizeof(long) * 8; k++) { for (k = 0; k < (int)sizeof(long) * 8; k++) {
if (val.val_as.lng & (1L << k)) if (val.val_as.lng & (1L << k))
if (!symbol_by_value(1L << k, ef_ptr(ca[i].ca_table, 0))) { if (!symbol_by_value(1L << k,
fprintf(stderr, ef_ptr(ca[i].ca_table, 0))) {
"bit %d not found in symbol table %s " verify_fail(type, row, &ca[i],
"when verify table %s row %d field %s\n", "bit %d is not in symbol table %s",
k, ef_nameof(ca[i].ca_table), k, ef_nameof(ca[i].ca_table));
ef_nameof(type), row + 1, ca[i].ca_name);
ret_val = -1; ret_val = -1;
} }
} }
} else if (ca[i].ca_table == type && i == 0) { } else if (ca[i].ca_table == type && i == 0) {
/* uid */ /* uid */
if (val.val_as.lng != row) { if (val.val_as.lng != row) {
fprintf(stderr, verify_fail(type, row, &ca[i],
"table %s row %d field %s is %ld instead of %d\n", "value is %ld instead of %d",
ef_nameof(type), row + 1, ca[i].ca_name, val.val_as.lng, row);
val.val_as.lng, row);
ret_val = -1; ret_val = -1;
} }
@ -107,25 +126,19 @@ verify_row(int type, int row)
/* symbol */ /* symbol */
if (!symbol_by_value(val.val_as.lng, if (!symbol_by_value(val.val_as.lng,
ef_ptr(ca[i].ca_table, 0))) { ef_ptr(ca[i].ca_table, 0))) {
fprintf(stderr, "value %ld not found in " verify_fail(type, row, &ca[i],
"symbol table %s when verify table %s " "value %ld is not in symbol table %s",
"row %d field %s\n", val.val_as.lng, ef_nameof(ca[i].ca_table));
val.val_as.lng,
ef_nameof(ca[i].ca_table),
ef_nameof(type), row + 1,
ca[i].ca_name);
ret_val = -1; ret_val = -1;
} }
} else { } else {
/* table index */ /* table index */
if (val.val_as.lng >= ef_nelem(ca[i].ca_table) if (val.val_as.lng >= ef_nelem(ca[i].ca_table)
|| val.val_as.lng < -1) { || val.val_as.lng < -1) {
fprintf(stderr, "Table index %ld to table %s " verify_fail(type, row, &ca[i],
"out of range, nelements %d for table %s " "value %ld indexes table %s out of bounds 0..%d",
"row %d field %s\n", val.val_as.lng, ef_nameof(ca[i].ca_table),
val.val_as.lng, ef_nameof(ca[i].ca_table), ef_nelem(ca[i].ca_table));
ef_nelem(ca[i].ca_table), ef_nameof(type),
row + 1, ca[i].ca_name);
ret_val = -1; ret_val = -1;
} }
} }