STABLE14-rxgen-multi-prototypes-20051014

FIXES 22349

generate prototypes for split stuff when the stub is multi

(cherry picked from commit a9fd6619a4e74930ae27744f95f04fefabaa6c9f)

diff --git a/src/rxgen/rpc_hout.c b/src/rxgen/rpc_hout.c
index 34618d52fab803f3b4a03dbb725fc34b4a1156f2..a0abfa2d5ceda77470aecca2e612c16b0fa6ae15 100644 (file)
--- a/src/rxgen/rpc_hout.c
+++ b/src/rxgen/rpc_hout.c
@@ -259,8 +259,9 @@ static void
 psprocdef(definition * defp)
 {
     int split_flag = defp->pc.split_flag;
+    int multi_flag = defp->pc.multi_flag;
 
-    if (split_flag) {
+    if (split_flag || multi_flag) {
        psproc1(defp, 1, "int", "Start",
                (1 << DEF_INPARAM) | (1 << DEF_INOUTPARAM));
        psproc1(defp, 1, "int", "End",

diff --git a/src/rxgen/rpc_parse.c b/src/rxgen/rpc_parse.c
index 63a47fa8b38489980f62ccba1aa368845e89530e..74b81cc53eb537e4cf42ce09804b4976025123f2 100644 (file)
--- a/src/rxgen/rpc_parse.c
+++ b/src/rxgen/rpc_parse.c
@@ -775,7 +775,10 @@ check_proc(definition * defp, token * tokp, int noname)
     scan4(TOK_SPLIT, TOK_MULTI, TOK_EQUAL, TOK_SEMICOLON, &tok);
     if (tok.kind == TOK_MULTI) {
        proc_multi = 1;
+       defp->pc.multi_flag = 1;
        scan2(TOK_EQUAL, TOK_SEMICOLON, &tok);
+    } else {
+       defp->pc.multi_flag = 0;
     }
     if (tok.kind == TOK_SPLIT) {
        proc_split = 1;

diff --git a/src/rxgen/rpc_parse.h b/src/rxgen/rpc_parse.h
index 84c2adfa6520f0dbf104b77970d5156be32ceaa9..81977e9a32101d0c647eab8bc5bb0b6353700ec4 100644 (file)
--- a/src/rxgen/rpc_parse.h
+++ b/src/rxgen/rpc_parse.h
@@ -188,6 +188,7 @@ struct procedure_def {
 #define        INOUT   2
     short paramtypes[3];
     char split_flag;
+    char multi_flag;
     relation rel;
     proc1_list *plists;
 };