Skip to content

Remove ERPC_PRE_POST_ACTION dependency on return type #238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 3, 2022
Merged

Remove ERPC_PRE_POST_ACTION dependency on return type #238

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions erpcgen/src/templates/c_client_source.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ extern ClientManager *g_client;
{% endif -- generateErrorChecks %}
{% if fn.returnValue.type.isNotVoid %}
{$fn.returnValue.resultVariable}{% if fn.returnValue.isNullReturnType %} = NULL{%endif%};
{% endif -- isNotVoid %}

#if ERPC_PRE_POST_ACTION
pre_post_action_cb preCB = g_client->getPreCB();
Expand All @@ -57,7 +58,6 @@ extern ClientManager *g_client;
}
#endif

{% endif -- isNotVoid %}
// Get a new request.
{% if !fn.isReturnValue %}
RequestContext request = g_client->createRequest(true);
Expand Down Expand Up @@ -141,7 +141,6 @@ extern ClientManager *g_client;
// Invoke error handler callback function
g_client->callErrorHandler(err, {$functionIDName});
{% endif -- generateErrorChecks %}
{% if generateErrorChecks && fn.returnValue.type.isNotVoid %}

#if ERPC_PRE_POST_ACTION
pre_post_action_cb postCB = g_client->getPostCB();
Expand All @@ -151,6 +150,7 @@ extern ClientManager *g_client;
}
#endif

{% if generateErrorChecks && fn.returnValue.type.isNotVoid %}
{% if empty(fn.returnValue.errorReturnValue) == false && fn.returnValue.isNullReturnType == false %}

if (err != kErpcStatus_Success)
Expand Down