Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2016-05-12 17:58:51 +0000
committerHenrik Rentz-Reichert2016-05-12 17:58:51 +0000
commitca194fc0bb7fefa1f5c2b38293454b7e5d6f9e48 (patch)
tree311dcd83ec65f27140579a7e1a20675fcb66e3ae /runtime/org.eclipse.etrice.runtime.c/src/common/messaging/etMessageService.c
parent63fc31c930f81b2d6350d759bde58356835b24ea (diff)
downloadorg.eclipse.etrice-ca194fc0bb7fefa1f5c2b38293454b7e5d6f9e48.tar.gz
org.eclipse.etrice-ca194fc0bb7fefa1f5c2b38293454b7e5d6f9e48.tar.xz
org.eclipse.etrice-ca194fc0bb7fefa1f5c2b38293454b7e5d6f9e48.zip
some adjustments in C projects and generators to be ANSI compatible
Diffstat (limited to 'runtime/org.eclipse.etrice.runtime.c/src/common/messaging/etMessageService.c')
-rw-r--r--runtime/org.eclipse.etrice.runtime.c/src/common/messaging/etMessageService.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/runtime/org.eclipse.etrice.runtime.c/src/common/messaging/etMessageService.c b/runtime/org.eclipse.etrice.runtime.c/src/common/messaging/etMessageService.c
index 196c5be40..98940d81d 100644
--- a/runtime/org.eclipse.etrice.runtime.c/src/common/messaging/etMessageService.c
+++ b/runtime/org.eclipse.etrice.runtime.c/src/common/messaging/etMessageService.c
@@ -78,6 +78,7 @@ void etMessageService_start(etMessageService* self){
}
void etMessageService_stop(etMessageService* self){
+ etSystemProtocolConjPort port;
ET_MSC_LOGGER_SYNC_ENTRY("etMessageService", "stop")
if (self->execmode==EXECMODE_POLLED || self->execmode==EXECMODE_MIXED) {
@@ -85,7 +86,6 @@ void etMessageService_stop(etMessageService* self){
}
/* create a temporary port struct and send the terminate message */
- etSystemProtocolConjPort port;
port.localId = 0;
port.msgService = self;
port.peerAddress = MESSAGESERVICE_ADDRESS;
@@ -129,9 +129,11 @@ void etMessageService_pushMessage(etMessageService* self, etMessage* msg){
}
etMessage* etMessageService_popMessage(etMessageService* self){
+ etMessage* msg;
+
ET_MSC_LOGGER_SYNC_ENTRY("etMessageService", "popMessage")
etMutex_enter(&self->queueMutex);
- etMessage* msg = etMessageQueue_pop(&self->messageQueue);
+ msg = etMessageQueue_pop(&self->messageQueue);
etMutex_leave(&self->queueMutex);
ET_MSC_LOGGER_SYNC_EXIT
return msg;

Back to the top