From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 27 Nov 2016 17:18:44 +0000 (+0000)
Subject: regress: hmacros.i4: Provide hm_rv_* in hm_create_nothing
X-Git-Tag: adns-1.6.0~61
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0fdc13e42c6fdb93248d6e5c243827f2d01fd7c6;p=adns.git

regress: hmacros.i4: Provide hm_rv_* in hm_create_nothing

This is convenient, and it is going to become more so.  No functional
change.

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

diff --git a/regress/hfuzzraw.c.m4 b/regress/hfuzzraw.c.m4
index 726b1b9..6984c8b 100644
--- a/regress/hfuzzraw.c.m4
+++ b/regress/hfuzzraw.c.m4
@@ -186,12 +186,7 @@ m4_define(`hm_syscall', `
  hm_create_proto_h
 int H$1(hm_args_massage($3,void)) {
  int r;
- m4_define(`hm_rv_fd',`')
- m4_define(`hm_rv_any',`')
- m4_define(`hm_rv_len',`')
- m4_define(`hm_rv_must',`')
- m4_define(`hm_rv_succfail',`')
- m4_define(`hm_rv_fcntl',`')
+ hm_create_nothing
  $2
 
  hm_create_hqcall_vars
diff --git a/regress/hmacros.i4 b/regress/hmacros.i4
index 4dc4662..b776f14 100644
--- a/regress/hmacros.i4
+++ b/regress/hmacros.i4
@@ -54,6 +54,12 @@ m4_define(`hm_create_nothing', `
  m4_define(`hm_arg_bytes_in', `')
  m4_define(`hm_arg_bytes_out', `')
  m4_define(`hm_arg_addr_out', `')
+ m4_define(`hm_rv_must', `')
+ m4_define(`hm_rv_any', `')
+ m4_define(`hm_rv_fd', `')
+ m4_define(`hm_rv_succfail', `')
+ m4_define(`hm_rv_len', `')
+ m4_define(`hm_rv_fcntl', `')
 ')
 
 m4_define(`hm_create_proto_h',`
diff --git a/regress/hplayback.c.m4 b/regress/hplayback.c.m4
index 46554d6..db50e4d 100644
--- a/regress/hplayback.c.m4
+++ b/regress/hplayback.c.m4
@@ -339,12 +339,9 @@ m4_define(`hm_syscall', `
  hm_create_proto_h
 int H$1(hm_args_massage($3,void)) {
  int r, amtread;
+ hm_create_nothing
  m4_define(`hm_rv_fd',`char *ep;')
  m4_define(`hm_rv_any',`char *ep;')
- m4_define(`hm_rv_len',`')
- m4_define(`hm_rv_must',`')
- m4_define(`hm_rv_succfail',`')
- m4_define(`hm_rv_fcntl',`')
  $2
 
  hm_create_hqcall_vars