From 9c97decf1d7f1dbcb6d01dd9a47b7ea824ab0318 Mon Sep 17 00:00:00 2001 From: Andrzej Popowski Date: Wed, 1 Jul 2015 13:44:14 +0200 Subject: [PATCH] [Download] - removing warnings after adding the conpilation option -Wall [Verification] - the code compiles without errors and warnings in Download module Change-Id: I7cb5b7d50e6304969f7af2249492fa3747f4eb8a Signed-off-by: Andrzej Popowski --- src/download/download_instance.cc | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/download/download_instance.cc b/src/download/download_instance.cc index f731425a..3b496143 100755 --- a/src/download/download_instance.cc +++ b/src/download/download_instance.cc @@ -110,6 +110,8 @@ void DownloadInstance::OnStateChanged(int download_id, downCbPtr->callbackId, static_cast(state)); switch (state) { + case DOWNLOAD_STATE_NONE: + break; case DOWNLOAD_STATE_DOWNLOADING: OnStart(download_id, user_data); break; @@ -125,6 +127,9 @@ void DownloadInstance::OnStateChanged(int download_id, case DOWNLOAD_STATE_FAILED: g_idle_add(OnFailed, downCbPtr); break; + default: + LoggerD("Unexpected download state: %d", state); + break; } } @@ -158,7 +163,6 @@ gboolean DownloadInstance::OnProgressChanged(void* user_data) { void DownloadInstance::OnStart(int download_id, void* user_data) { LoggerD("Entered"); unsigned long long totalSize; - int ret; DownloadCallback* downCbPtr = static_cast(user_data); std::lock_guard lock(instances_mutex_); @@ -368,6 +372,8 @@ gboolean DownloadInstance::OnFailed(void* user_data) { case DOWNLOAD_ERROR_IO_ERROR: instance->ReportError(IOException("Internal I/O error"), out); break; + case DOWNLOAD_ERROR_NONE: + break; } out["callbackId"] = @@ -392,7 +398,7 @@ void DownloadInstance::DownloadManagerStart LoggerD("Entered"); CHECK_EXIST(args, "callbackId", out) - int ret, downlodId; + int ret; std::string networkType; DownloadInfoPtr diPtr(new DownloadInfo); @@ -507,8 +513,6 @@ void DownloadInstance::DownloadManagerStart ret = download_set_url(diPtr->download_id, diPtr->url.c_str()); - const char* dest; - if (diPtr->destination.size() != 0) { ret = download_set_destination(diPtr->download_id, diPtr->destination.c_str()); } @@ -696,6 +700,8 @@ void DownloadInstance::DownloadManagerGetstate if (ret == DOWNLOAD_ERROR_NONE) { switch (state) { + case DOWNLOAD_STATE_NONE: + break; case DOWNLOAD_STATE_QUEUED: stateValue = "QUEUED"; break; @@ -714,7 +720,10 @@ void DownloadInstance::DownloadManagerGetstate case DOWNLOAD_STATE_CANCELED: stateValue = "CANCELED"; break; - } + default: + LoggerD("Unexpected download state: %d", state); + break; + } ReportSuccess(picojson::value(stateValue), out); } else if (ret == DOWNLOAD_ERROR_INVALID_PARAMETER) { -- 2.34.1