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

(verify_fail): New parameter idx. Use it to print array index when

Browse source 
applicable.  Callers changed.
This commit is contained in:
Markus Armbruster 2006-05-24 18:32:13 +00:00
parent 46a7a9c17f
commit cc1df4e88a
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -40,11 +40,11 @@
#include "file.h" #include "file.h"
#include "nsc.h" #include "nsc.h"
static void verify_fail(int, int, struct castr *, char *, ...) static void verify_fail(int, int, struct castr *, int, char *, ...)
ATTRIBUTE((format (printf, 4, 5))); ATTRIBUTE((format (printf, 5, 6)));
static void static void
verify_fail(int type, int row, struct castr *ca, char *fmt, ...) verify_fail(int type, int row, struct castr *ca, int idx, char *fmt, ...)
{ {
int i; int i;
va_list ap; va_list ap;
@ -52,9 +52,12 @@ verify_fail(int type, int row, struct castr *ca, char *fmt, ...)
/* Find base table of view, if any */ /* Find base table of view, if any */
for (i = 0; empfile[i].cache == empfile[type].cache; i++) ; for (i = 0; empfile[i].cache == empfile[type].cache; i++) ;
fprintf(stderr, "%s %s uid %d field %s: ", fprintf(stderr, "%s %s uid %d field %s",
EF_IS_GAME_STATE(i) ? "File" : "Config", EF_IS_GAME_STATE(i) ? "File" : "Config",
ef_nameof(type), row, ca->ca_name); ef_nameof(type), row, ca->ca_name);
if (ca->ca_type != NSC_STRINGY && ca->ca_len != 0)
fprintf(stderr, " index %d", idx);
fprintf(stderr, ": ");
va_start(ap, fmt); va_start(ap, fmt);
vfprintf(stderr, fmt, ap); vfprintf(stderr, fmt, ap);
va_end(ap); va_end(ap);
@ -107,7 +110,7 @@ verify_row(int type, int row)
if (val.val_as.lng & (1L << k)) if (val.val_as.lng & (1L << k))
if (!symbol_by_value(1L << k, if (!symbol_by_value(1L << k,
ef_ptr(ca[i].ca_table, 0))) { ef_ptr(ca[i].ca_table, 0))) {
verify_fail(type, row, &ca[i], verify_fail(type, row, &ca[i], j,
"bit %d is not in symbol table %s", "bit %d is not in symbol table %s",
k, ef_nameof(ca[i].ca_table)); k, ef_nameof(ca[i].ca_table));
ret_val = -1; ret_val = -1;
@ -120,7 +123,7 @@ verify_row(int type, int row)
if (val.val_as.lng == 0) if (val.val_as.lng == 0)
continue; continue;
if (val.val_as.lng != row) { if (val.val_as.lng != row) {
verify_fail(type, row, &ca[i], verify_fail(type, row, &ca[i], j,
"value is %ld instead of %d", "value is %ld instead of %d",
val.val_as.lng, row); val.val_as.lng, row);
ret_val = -1; ret_val = -1;
@ -130,7 +133,7 @@ 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))) {
verify_fail(type, row, &ca[i], verify_fail(type, row, &ca[i], j,
"value %ld is not in symbol table %s", "value %ld is not in symbol table %s",
val.val_as.lng, ef_nameof(ca[i].ca_table)); val.val_as.lng, ef_nameof(ca[i].ca_table));
ret_val = -1; ret_val = -1;
@ -139,7 +142,7 @@ verify_row(int type, int row)
/* 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) {
verify_fail(type, row, &ca[i], verify_fail(type, row, &ca[i], j,
"value %ld indexes table %s out of bounds 0..%d", "value %ld indexes table %s out of bounds 0..%d",
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));