Make nstr_exec_val() return its first argument

diff --git a/include/nsc.h b/include/nsc.h
index 636e0548085d3bb35f897d009faeda18e0acf7e8..e8c82646f947d44acc6260e1c2a5ec4a44246526 100644 (file)
--- 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 92d4762f7886ee37ae06e40001613d9de7e9e56b..c04c72a60d2b2324d6755a52ec49526c2003336f 100644 (file)
--- 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 24d9dda056afc98fa38b79809c68808c895f1560..550a6847bee4fa694c8a434582f1b7fe0b621421 100644 (file)
--- 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;
 }
 
 /*