From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Tue, 5 Feb 2008 18:53:22 +0000 (+0000)
Subject: STABLE14-rxgen-multi-prototypes-20080205
X-Git-Tag: openafs-stable-1_4_7pre1~41
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=0528081400ac7ce037df9c9923ad7e88945afaef;p=packages%2Fo%2Fopenafs.git

STABLE14-rxgen-multi-prototypes-20080205

LICENSE MIT

When 'multi' is applied to an RPC definition, rxgen produced split prototypes,
Start and End, but failed to produce the prototype for the normal RPC call.


(cherry picked from commit 0088e5cb20c90a899aacb62cd13b57a7bbe13432)
---

diff --git a/src/rxgen/rpc_hout.c b/src/rxgen/rpc_hout.c
index a5a85b29f..412af47a3 100644
--- a/src/rxgen/rpc_hout.c
+++ b/src/rxgen/rpc_hout.c
@@ -268,9 +268,9 @@ psprocdef(definition * defp)
 		(1 << DEF_INPARAM) | (1 << DEF_INOUTPARAM));
 	psproc1(defp, 1, "int", "End",
 		(1 << DEF_OUTPARAM) | (1 << DEF_INOUTPARAM));
-    } else {
-	psproc1(defp, 0, "int", "", 0xFFFFFFFF);
-    }
+    } 
+    if (!(!multi_flag && split_flag))
+        psproc1(defp, 0, "int", "", 0xFFFFFFFF);
 
     if (uflag && !kflag)
 	psproc1(defp, 2, "int", "ubik_", 0xFFFFFFFF);