Fix problem with security-server build with tizen 3.0 toolchain
authorPawel Polawski <p.polawski@partner.samsung.com>
Wed, 25 Sep 2013 08:34:30 +0000 (10:34 +0200)
committerBartlomiej Grzelewski <b.grzelewski@samsung.com>
Thu, 6 Feb 2014 16:13:22 +0000 (17:13 +0100)
[Issue#]        SSDWSSP-549
[Bug/Feature]   Fix errors in build
[Cause]         Required static cast in switch statement
[Solution]      Static cast added
[Verification]  Build

Change-Id: If3d354e87ed8d7edd1c485c98b1a8023876c4abd

src/server/security-server-main.c
src/server2/service/cookie.cpp

index 9232f10b18be9b2b1c7742e43987d2ceac2f4c35..1a3ff2929b81566ffcc743eaadc98e0742fdd37a 100644 (file)
@@ -358,13 +358,12 @@ int client_has_access(int sockfd, const char *object)
 void *security_server_thread(void *param)
 {
     int client_sockfd = -1;
-    int server_sockfd, retval;
+    int retval;
     basic_header basic_hdr;
     struct security_server_thread_param *my_param;
 
     my_param = (struct security_server_thread_param*) param;
     client_sockfd = my_param->client_sockfd;
-    server_sockfd = my_param->server_sockfd;
 
     /* Receive request header */
     retval = recv_hdr(client_sockfd, &basic_hdr);
index 4357d3b1b3de631491d7239436b0bc7b6f9c87b3..1b28f8595d87dfd9ebc59d5277ce1e629f6f5483 100644 (file)
@@ -136,7 +136,7 @@ bool CookieService::readOne(const ConnectionID &conn, SocketBuffer &buffer, int
             break;
         };
     } else if (interfaceID == INTERFACE_CHECK) {
-        switch(msgType) {
+        switch(static_cast<CookieCall>(msgType)) {
         case CookieCall::CHECK_PID:
             LogDebug("Entering pid-by-cookie server side handler");
             retval = pidByCookieRequest(buffer, send);
@@ -164,7 +164,7 @@ bool CookieService::readOne(const ConnectionID &conn, SocketBuffer &buffer, int
         };
     } else if (interfaceID == INTERFACE_CHECK_TMP) {
         //TODO: Merge this interface with INTERFACE_CHECK after INTERFACE_CHECK will be secured by smack 
-        switch(msgType) {
+        switch(static_cast<CookieCall>(msgType)) {
         case CookieCall::CHECK_UID:
             LogDebug("Entering get-uid-by-cookie side handler");
             retval = uidByCookieRequest(buffer, send);