From 8250a8224a3453dde3a2fb700120934fa4ebfc70 Mon Sep 17 00:00:00 2001

Message-Id: <8250a8224a3453dde3a2fb700120934fa4ebfc70.1348657454.git.ibell@...>

In-Reply-To: <6456222f7ea01be922ce869d84b615bcc03cc79c.1348657454.git.ibell@...>

References: <6456222f7ea01be922ce869d84b615bcc03cc79c.1348657454.git.ibell@...>

From: Ian Bell <ibell@...>

Date: Wed, 26 Sep 2012 11:54:11 +0100

Subject: [PATCH 5/6] [mama] Warnings fixes

Fixed some warnings in listenermsgcallback

Signed-off-by: Ian Bell <ibell@...>

---

mama/c_cpp/src/c/listenermsgcallback.c |    8 ++++----

1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mama/c_cpp/src/c/listenermsgcallback.c b/mama/c_cpp/src/c/listenermsgcallback.c

index 9630b39..ca9db2c 100644

--- a/mama/c_cpp/src/c/listenermsgcallback.c

+++ b/mama/c_cpp/src/c/listenermsgcallback.c

@@ -50,7 +50,7 @@ void listenerMsgCallback_invokeErrorCallback(listenerMsgCallback callback,

         SubjectContext *ctx, mama_status mamaStatus, mamaSubscription

         subscription, const char *userSymbol);

-void listenerMsgCallbackImpl_logUnknownStatus(SubjectContext *ctx, int status,

+void listenerMsgCallbackImpl_logUnknownStatus(SubjectContext *ctx, mamaMsgStatus status,

         mamaSubscription subscription);

 /**

@@ -246,7 +246,7 @@ listenerMsgCallback_processMsg( listenerMsgCallback callback, mamaMsg msg,

                                 SubjectContext *ctx)

{

     int               msgType           = mamaMsgType_typeForMsg (msg);

-    int               status            = mamaMsgImpl_getStatusFromMsg (msg);

+    mamaMsgStatus     status            = mamaMsgImpl_getStatusFromMsg (msg);

     msgCallback*      impl              = (msgCallback*)callback;

     mamaSubscription  subscription      = impl->mSubscription;

     int               expectingInitial  = 0;

@@ -369,7 +369,7 @@ listenerMsgCallback_processMsg( listenerMsgCallback callback, mamaMsg msg,

                     (*(mamaInternal_getGlobalStatsCollector()),

                      MamaStatUnknownMsgs.mFid);

             }

-            return; //throw away msg

+            return; /* throw away msg */

             break;

         }

         default:

@@ -621,7 +621,7 @@ checkEntitlement( msgCallback *callback, mamaMsg msg, SubjectContext* ctx )

#endif /* WITH_ENTITLEMENTS */

}

-void listenerMsgCallbackImpl_logUnknownStatus(SubjectContext *ctx, int status,

+void listenerMsgCallbackImpl_logUnknownStatus(SubjectContext *ctx, mamaMsgStatus status,

         mamaSubscription subscription)

{

     /* Write the log at fine level. */

--

1.7.9.5