From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 30 Nov 2016 18:33:48 +0000 (+0000)
Subject: regress: Rename Tensurerecordfile to Tensuresetup
X-Git-Tag: adns-1.6.0~39
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=e18d88ce9eeb95d68a8853ea935ac9dcfef7b933;p=adns.git

regress: Rename Tensurerecordfile to Tensuresetup

This is much less confusing and reflects its real role better.  We
will deal with the remaining bits of Tensure<something> that aren't
Tensurerecordfile, in a moment.

 perl -i~ -pe 's/Tensurerecordfile/Tensuresetup/g' *.m4

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/regress/harness.h.m4 b/regress/harness.h.m4
index 9d95778..aa56184 100644
--- a/regress/harness.h.m4
+++ b/regress/harness.h.m4
@@ -51,7 +51,7 @@ void Tfailed(const char *why);
 void Toutputerr(void);
 void Tnomem(void);
 void Tfsyscallr(const char *fmt, ...) PRINTFFORMAT(1,2);
-void Tensurerecordfile(void);
+void Tensuresetup(void);
 void Tmust(const char *call, const char *arg, int cond);
 
 void Tvbf(const char *fmt, ...) PRINTFFORMAT(1,2);
diff --git a/regress/hcommon.c.m4 b/regress/hcommon.c.m4
index 3a70010..5e3b587 100644
--- a/regress/hcommon.c.m4
+++ b/regress/hcommon.c.m4
@@ -69,7 +69,7 @@ const int Tnerrnos= sizeof(Terrnos)/sizeof(Terrnos[0]) - 1;
 static vbuf vbw;
 
 int Hgettimeofday(struct timeval *tv, struct timezone *tz) {
-  Tensurerecordfile();
+  Tensuresetup();
   Tmust("gettimeofday","tz",!tz);
   T_gettimeofday_hook();
   *tv= currenttime;
diff --git a/regress/hfuzzraw.c.m4 b/regress/hfuzzraw.c.m4
index 034922a..04f802f 100644
--- a/regress/hfuzzraw.c.m4
+++ b/regress/hfuzzraw.c.m4
@@ -53,7 +53,7 @@ static void Tflushstdout( void) {
   if (fflush(stdout)) Toutputerr();
 }
 
-void Tensurerecordfile(void) {
+void Tensuresetup(void) {
   static int done;
 
   if (done) return;
@@ -241,7 +241,7 @@ int H$1(hm_args_massage($3,void)) {
  hm_create_hqcall_init($1)
  $3
 
- Tensurerecordfile();
+ Tensuresetup();
 
  if (stdout_enable) {
    hm_create_hqcall_args
diff --git a/regress/hplayback.c.m4 b/regress/hplayback.c.m4
index be46e08..e0aba98 100644
--- a/regress/hplayback.c.m4
+++ b/regress/hplayback.c.m4
@@ -105,7 +105,7 @@ void T_gettimeofday_hook(void) {
   FR_WRITE(delta);
 }
 
-void Tensurerecordfile(void) {
+void Tensuresetup(void) {
   int fd;
   int chars;
   unsigned long sec, usec;
@@ -338,7 +338,7 @@ static int Pbytes(byte *buf, int maxlen) {
 void Q_vb(void) {
   const char *nl;
 
-  Tensurerecordfile();
+  Tensuresetup();
   if (!adns__vbuf_ensure(&vb2,vb.used+2)) Tnomem();
   fread(vb2.buf,1,vb.used+2,Tinputfile);
   if (feof(Tinputfile)) {
diff --git a/regress/hrecord.c.m4 b/regress/hrecord.c.m4
index 2ce72d7..c8a133e 100644
--- a/regress/hrecord.c.m4
+++ b/regress/hrecord.c.m4
@@ -44,7 +44,7 @@ static void R_recordtime(void) {
   int r;
   struct timeval tv, tvrel;
 
-  Tensurerecordfile();
+  Tensuresetup();
   r= gettimeofday(&tv,0); if (r) Tfailed("gettimeofday syscallbegin");
   tvrel.tv_sec= tv.tv_sec - currenttime.tv_sec;
   tvrel.tv_usec= tv.tv_usec - currenttime.tv_usec;
@@ -55,7 +55,7 @@ static void R_recordtime(void) {
 
 void T_gettimeofday_hook(void) { }
 
-void Tensurerecordfile(void) {
+void Tensuresetup(void) {
   const char *fdstr;
   int fd, r;
 
@@ -75,7 +75,7 @@ void Tensurerecordfile(void) {
 
 void Q_vb(void) {
   if (!adns__vbuf_append(&vb,"",1)) Tnomem();
-  Tensurerecordfile();
+  Tensuresetup();
   if (fprintf(Toutputfile," %s\n",vb.buf) == EOF) Toutputerr();
   if (fflush(Toutputfile)) Toutputerr();
 }