From: Pawel Polawski
Date: Wed, 25 Sep 2013 08:34:30 +0000 (+0200)
Subject: Fix problem with security-server build with tizen 3.0 toolchain
X-Git-Tag: submit/tizen/20140307.131547~63
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ebbea4f3a693254fd15effef020974041ba0229d;p=platform%2Fcore%2Fsecurity%2Fsecurity-server.git
Fix problem with security-server build with tizen 3.0 toolchain
[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
---
diff --git a/src/server/security-server-main.c b/src/server/security-server-main.c
index 9232f10..1a3ff29 100644
--- a/src/server/security-server-main.c
+++ b/src/server/security-server-main.c
@@ -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);
diff --git a/src/server2/service/cookie.cpp b/src/server2/service/cookie.cpp
index 4357d3b..1b28f85 100644
--- a/src/server2/service/cookie.cpp
+++ b/src/server2/service/cookie.cpp
@@ -136,7 +136,7 @@ bool CookieService::readOne(const ConnectionID &conn, SocketBuffer &buffer, int
break;
};
} else if (interfaceID == INTERFACE_CHECK) {
- switch(msgType) {
+ switch(static_cast(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(msgType)) {
case CookieCall::CHECK_UID:
LogDebug("Entering get-uid-by-cookie side handler");
retval = uidByCookieRequest(buffer, send);