From 93a5779e669665403b0245de2094dbde5847f14e Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Tue, 4 Mar 2008 08:03:01 +0100 Subject: [PATCH] Make nstr_exec_val() return its first argument --- include/nsc.h | 2 +- src/lib/commands/xdump.c | 3 +-- src/lib/common/nstreval.c | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/nsc.h b/include/nsc.h index 636e0548..e8c82646 100644 --- a/include/nsc.h +++ b/include/nsc.h @@ -277,7 +277,7 @@ extern char *nstr_comp_val(char *, struct valstr*, int); extern int nstr_coerce_val(struct valstr *, nsc_type, char *); extern int nstr_exec(struct nscstr *, int, void *); /* src/lib/common/nstreval.c */ -extern void nstr_exec_val(struct valstr *, natid, void *, nsc_type); +extern struct valstr *nstr_exec_val(struct valstr *, natid, void *, nsc_type); extern int nstr_promote(int); extern char *symbol_by_value(int, struct symbol *); /* src/lib/global/nsc.c */ diff --git a/src/lib/commands/xdump.c b/src/lib/commands/xdump.c index 92d4762f..c04c72a6 100644 --- a/src/lib/commands/xdump.c +++ b/src/lib/commands/xdump.c @@ -102,8 +102,7 @@ xdeval(struct valstr *val, val->val_as.sym.off = off; val->val_as.sym.len = len; val->val_as.sym.idx = idx; - nstr_exec_val(val, player->cnum, ptr, NSC_NOTYPE); - return val; /* FIXME nstr_exec_val() should return VAL */ + return nstr_exec_val(val, player->cnum, ptr, NSC_NOTYPE); } /* diff --git a/src/lib/common/nstreval.c b/src/lib/common/nstreval.c index 24d9dda0..550a6847 100644 --- a/src/lib/common/nstreval.c +++ b/src/lib/common/nstreval.c @@ -53,7 +53,7 @@ * WANT. VAL must be coercible. That's the case if a previous * nstr_coerce_val(VAL, WANT, STR) succeeded. */ -void +struct valstr * nstr_exec_val(struct valstr *val, natid cnum, void *ptr, nsc_type want) { char *memb_ptr; @@ -158,6 +158,7 @@ nstr_exec_val(struct valstr *val, natid cnum, void *ptr, nsc_type want) } val->val_type = valtype; + return val; } /*