X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib/blobdiff_plain/c4ccbbf992e1587ae316f66af6a28006780688d8..6e683a79101025ee0d371f0b9bece811856edd8d:/test/tvec-core.c?ds=inline

diff --git a/test/tvec-core.c b/test/tvec-core.c
index e4f9f84..fc1b413 100644
--- a/test/tvec-core.c
+++ b/test/tvec-core.c
@@ -318,7 +318,7 @@ int tvec_syntax_v(struct tvec_state *tv, int ch,
   dstr_destroy(&d); return (-1);
 }
 
-/* --- @tvec_unkreg@ --- *
+/* --- @tvec_unkregerr@ --- *
  *
  * Arguments:	@struct tvec_state *tv@ = test-vector state
  *		@const char *name@ = register or pseudoregister name
@@ -329,13 +329,13 @@ int tvec_syntax_v(struct tvec_state *tv, int ch,
  *		unrecognized.
  */
 
-int tvec_unkreg(struct tvec_state *tv, const char *name)
+int tvec_unkregerr(struct tvec_state *tv, const char *name)
 {
   return (tvec_error(tv, "unknown special register `%s' for test `%s'",
 		     name, tv->test->name));
 }
 
-/* --- @tvec_dupreg@ --- *
+/* --- @tvec_dupregerr@ --- *
  *
  * Arguments:	@struct tvec_state *tv@ = test-vector state
  *		@const char *name@ = register or pseudoregister name
@@ -346,7 +346,7 @@ int tvec_unkreg(struct tvec_state *tv, const char *name)
  *		assigned already in the current test.
  */
 
-int tvec_dupreg(struct tvec_state *tv, const char *name)
+int tvec_dupregerr(struct tvec_state *tv, const char *name)
   { return (tvec_error(tv, "register `%s' is already set", name)); }
 
 /* --- @tvec_skipspc@ --- *
@@ -956,7 +956,7 @@ static int core_setvar(struct tvec_state *tv, const char *name,
   struct groupstate *g = ctx;
 
   if (STRCMP(name, ==, "@outcome")) {
-    if (g->f&GRPF_SETOUTC) return (tvec_dupreg(tv, name));
+    if (g->f&GRPF_SETOUTC) return (tvec_dupregerr(tv, name));
     if (rv->u == XFAIL) tvec_xfail(tv);
     g->f |= GRPF_SETOUTC;
   } else assert(!"unknown var");
@@ -1113,7 +1113,7 @@ int tvec_read(struct tvec_state *tv, const char *infile, FILE *fp)
 	      vd = env->findvar(tv, d.buf, &varctx, g.ctx);
 		if (vd) goto found_var;
 	    }
-	    tvec_unkreg(tv, d.buf); goto flush_line;
+	    tvec_unkregerr(tv, d.buf); goto flush_line;
 	  found_var:
 	    rd = &vd->def;
 	  } else {
@@ -1130,7 +1130,7 @@ int tvec_read(struct tvec_state *tv, const char *infile, FILE *fp)
 	    /* Complain if the register is already set. */
 	    r = TVEC_REG(tv, in, rd->i);
 	    if (r->f&TVRF_SEEN)
-	      { tvec_dupreg(tv, rd->name); goto flush_line; }
+	      { tvec_dupregerr(tv, rd->name); goto flush_line; }
 	  }
 
 	  /* If there's no test, then report an error.  Set the muffle flag,