d2d-conv-manager: fix svace_2.2 issues

Signed-off-by: Hongkuk, Son <hongkuk.son@samsung.com>
Change-Id: I219e4d924ebf4b7a5e375f930d98787f324b1771

diff --git a/daemon/service_provider/AppCommServiceProvider.cpp b/daemon/service_provider/AppCommServiceProvider.cpp
index c59319b..f2c85b2 100755 (executable)
--- a/daemon/service_provider/AppCommServiceProvider.cpp
+++ b/daemon/service_provider/AppCommServiceProvider.cpp
@@ -110,11 +110,6 @@ int conv::AppCommServiceProvider::loadServiceInfo(Request* requestObj)
                if ( svcInfoBase != NULL ) {
                        _D("local service instance already exists");
                        svcInfo = reinterpret_cast<AppCommServiceInfo*>(svcInfoBase);
-
-                       if (svcInfo == NULL) {
-                               _D("casting failed");
-                               return CONV_ERROR_INVALID_OPERATION;
-                       }
                } else {
                        _D("allocating new service instance for local service");
                        svcInfo = new(std::nothrow) AppCommServiceInfo();
@@ -131,11 +126,6 @@ int conv::AppCommServiceProvider::loadServiceInfo(Request* requestObj)
                if ( svcInfoBase != NULL ) {
                        _D("service instance already exists");
                        svcInfo = reinterpret_cast<AppCommServiceInfo*>(svcInfoBase);
-
-                       if (svcInfo == NULL) {
-                               _D("casting failed");
-                               return CONV_ERROR_INVALID_OPERATION;
-                       }
                } else {
                        _D("allocating new service instance");
                        svcInfo = new(std::nothrow) AppCommServiceInfo();

diff --git a/daemon/service_provider/RemoteAppControlServiceProvider.cpp b/daemon/service_provider/RemoteAppControlServiceProvider.cpp
old mode 100644 (file)
new mode 100755 (executable)
index b27c294..5176684
--- a/daemon/service_provider/RemoteAppControlServiceProvider.cpp
+++ b/daemon/service_provider/RemoteAppControlServiceProvider.cpp
@@ -981,12 +981,6 @@ int conv::RemoteAppControlServiceProvider::loadServiceInfo(Request* requestObj)
        if (svcInfoBase != NULL) {
                _D("service instance already exists");
                svcInfo = reinterpret_cast<RemoteAppControlServiceInfo*>(svcInfoBase);
-
-               if (svcInfo == NULL)
-               {
-                       _D("casting failed");
-                       return CONV_ERROR_INVALID_OPERATION;
-               }
        } else {
                _D("allocating new service instance");
                svcInfo = new(std::nothrow) RemoteAppControlServiceInfo();

diff --git a/msf_tizen_client/src/Channel.cpp b/msf_tizen_client/src/Channel.cpp
index 24de9ea..b799ffc 100755 (executable)
--- a/msf_tizen_client/src/Channel.cpp
+++ b/msf_tizen_client/src/Channel.cpp
@@ -1065,13 +1065,10 @@ void Channel::publishMessage(string method, string event, const char *data,
                handleError(string(), Error::create("Not Connected"));
                return;
        } else {
-               if (write_buf_index == 999 && write_buf_count != 999) {
+               if (write_buf_index == 999) {
                        write_buf_index = 0;
                }
 
-               if (write_buf_count == 999) {
-               }
-
                write_buf_index++;
                write_buf_count++;
 
@@ -1169,13 +1166,10 @@ void Channel::start_app(char *data, int buflength, string msgID) {
        l += snprintf((char *)&prepare_buf[LWS_SEND_BUFFER_PRE_PADDING],
                        prepare_buf_size - LWS_SEND_BUFFER_PRE_PADDING, "%s", data);
 
-       if (write_buf_index == 999 && write_buf_count != 999) {
+       if (write_buf_index == 999) {
                write_buf_index = 0;
        }
 
-       if (write_buf_count == 999) {
-       }
-
        write_buf_index++;
        write_buf_count++;