Fix wrong name in server function call

Hadatko · Hadatko · commit c7d80d630a80 · 2023-10-12T23:00:22.000+02:00
Signed-off-by: Cervenka Dusan &lt;cervenka@acrios.com&gt;
diff --git a/erpcgen/src/CGenerator.cpp b/erpcgen/src/CGenerator.cpp
@@ -1971,10 +1971,10 @@ string CGenerator::getFunctionServerCall(Function *fn, bool isCCall)
                     proto += "&";
                 }
             }
-            std::string paramName = getOutputName(it);
-            if (paramName.empty())
+            std::string paramName = getOutputName(fn->getParameters().getMembers()[n]);
+            if ((paramName.empty()) || (funcType && funcType->getCallbackFuns().size() > 1))
             {
-                paramName = getOutputName(fn->getParameters().getMembers()[n]);
+                paramName = getOutputName(it);
             }
             proto += paramName;
 

Original file line number	Diff line number	Diff line change
`@@ -1971,10 +1971,10 @@ string CGenerator::getFunctionServerCall(Function *fn, bool isCCall)`
`1971`	`1971`	`proto += "&";`
`1972`	`1972`	`}`
`1973`	`1973`	`}`
`1974`		`- std::string paramName = getOutputName(it);`
`1975`		`- if (paramName.empty())`
	`1974`	`+ std::string paramName = getOutputName(fn->getParameters().getMembers()[n]);`
	`1975`	`+ if ((paramName.empty()) \|\| (funcType && funcType->getCallbackFuns().size() > 1))`
`1976`	`1976`	`{`
`1977`		`- paramName = getOutputName(fn->getParameters().getMembers()[n]);`
	`1977`	`+ paramName = getOutputName(it);`
`1978`	`1978`	`}`
`1979`	`1979`	`proto += paramName;`
`1980`	`1980`