From 08bd26d700620541d547b1cc96089f5cbc98119f Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 27 Nov 2016 17:29:20 +0000
Subject: [PATCH] regress: hfuzzraw: Break out P_succfail()

Hclose needs it.  No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 regress/hfuzzraw.c.m4 | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/regress/hfuzzraw.c.m4 b/regress/hfuzzraw.c.m4
index 6ed62da..587f7f7 100644
--- a/regress/hfuzzraw.c.m4
+++ b/regress/hfuzzraw.c.m4
@@ -167,6 +167,21 @@ int fd;
 }
 #endif
 
+static int P_succfail(void) {
+  int r;
+  P_READ(r);
+  if (r<0 && -r<Tnerrnos) {
+    errno= Terrnos[-r].v;
+    return -1;
+  } else if (r>0 && r<=255) {
+    errno= r;
+    return -1;
+  } else if (r) {
+    Pformat("wrong errno value");
+  }
+  return 0;
+}
+
 m4_define(`hm_syscall', `
  hm_create_proto_h
 int H$1(hm_args_massage($3,void)) {
@@ -193,17 +208,8 @@ int H$1(hm_args_massage($3,void)) {
  }
 
  m4_define(`hm_rv_succfail',`
-  P_READ(r);
-  if (r<0 && -r<Tnerrnos) {
-    errno= Terrnos[-r].v;
-    return -1;
-  } else if (r>0 && r<=255) {
-    errno= r;
-    return -1;
-  } else if (r) {
-    Pformat("wrong errno value");
-  }
-  r= 0;
+  r= P_succfail();
+  if (r<0) return r;
  ')
 
  m4_define(`hm_rv_any',`
-- 
2.30.2