SAM: remove Global Variable violations

Change-Id: Ib3b4b47aa62517df80ea446ba405fd3f5caa5d33

diff --git a/agent/download-agent-mime-util.c b/agent/download-agent-mime-util.c
index b195942..6b68924 100755 (executable)
--- a/agent/download-agent-mime-util.c
+++ b/agent/download-agent-mime-util.c
@@ -28,7 +28,7 @@
 
 #define MAX_EXT_NAME_LEN 12
 #define MAX_EXT_TABLE_INDEX 18
-Ext_translation_table ext_trans_table[MAX_EXT_TABLE_INDEX] = {
+static Ext_translation_table ext_trans_table[MAX_EXT_TABLE_INDEX] = {
        {"*.xla",                       "*.xls"},
        {"*.pot",                       "*.ppt"},
        {"*.xsl",                       "*.xml"},
@@ -56,17 +56,18 @@ struct sec_mime_table_t {
        char *mime;
        char *ext;
 };
-struct sec_mime_table_t sec_mime_table[MAX_SEC_MIME_TABLE_INDEX] = {
+
+static struct sec_mime_table_t sec_mime_table[MAX_SEC_MIME_TABLE_INDEX] = {
        {"audio/m4a",           "m4a"},
 };
 
-const char *ambiguous_MIME_Type_list[] = {
+static const char *ambiguous_MIME_Type_list[] = {
        "text/plain",
        "application/octet-stream"
 };
 
 /* Because xdgmime is not thread safety, this mutex is necessary */
-pthread_mutex_t mutex_for_xdgmime = PTHREAD_MUTEX_INITIALIZER;
+static pthread_mutex_t mutex_for_xdgmime = PTHREAD_MUTEX_INITIALIZER;
 
 da_bool_t is_ambiguous_MIME_Type(const char *in_mime_type)
 {

diff --git a/agent/download-agent-plugin-libcurl.c b/agent/download-agent-plugin-libcurl.c
index deb9aed..4d015ed 100755 (executable)
--- a/agent/download-agent-plugin-libcurl.c
+++ b/agent/download-agent-plugin-libcurl.c
@@ -24,8 +24,6 @@
 #include "download-agent-http-msg-handler.h"
 #include "download-agent-plugin-libcurl.h"
 
-da_bool_t using_content_sniffing = DA_FALSE;
-
 int __translate_error_code(int curl_error)
 {
        switch (curl_error) {
@@ -221,10 +219,8 @@ size_t __http_gotheaders_cb(void *ptr, size_t size, size_t nmemb, void *userdata
                DA_LOGI("Cancel requested");
                return -1;
        }
-       if (!using_content_sniffing)
-               __store_header(ptr, da_info, (size * nmemb), DA_NULL);
-       else
-               DA_LOGV("ignore because content sniffing is turned on");
+
+       __store_header(ptr, da_info, (size * nmemb), DA_NULL);
        /*
 #ifdef _RAF_SUPPORT
 DA_LOGI("[RAF] __http_gotheaders_cb done");

diff --git a/provider-interface/download-provider-interface.c b/provider-interface/download-provider-interface.c
index 2e9e961..5844c32 100755 (executable)
--- a/provider-interface/download-provider-interface.c
+++ b/provider-interface/download-provider-interface.c
@@ -86,8 +86,8 @@ typedef struct {
 } dp_interface_slot;
 
 // declare the variables
-dp_interface_ipc *g_dp_client = NULL;
-dp_interface_slot g_interface_slots[MAX_DOWNLOAD_HANDLE];
+static dp_interface_ipc *g_dp_client = NULL;
+static dp_interface_slot g_interface_slots[MAX_DOWNLOAD_HANDLE];
 static pthread_mutex_t g_function_mutex = PTHREAD_MUTEX_INITIALIZER;
 static pthread_mutex_t g_clear_mutex = PTHREAD_MUTEX_INITIALIZER;
 static pthread_t g_dp_event_thread_id = 0;

diff --git a/provider/download-provider-client-manager.c b/provider/download-provider-client-manager.c
index 789e232..e06b372 100755 (executable)
--- a/provider/download-provider-client-manager.c
+++ b/provider/download-provider-client-manager.c
@@ -48,8 +48,8 @@
 #include <download-provider-plugin-download-agent.h>
 #include <download-provider-network.h>
 
-int g_dp_sock = -1;
-dp_client_slots_fmt *g_dp_client_slots = NULL;
+static int g_dp_sock = -1;
+static dp_client_slots_fmt *g_dp_client_slots = NULL;
 static void *g_db_handle = 0;
 static pthread_mutex_t g_db_mutex = PTHREAD_MUTEX_INITIALIZER;
 extern pthread_t g_client_manager_tid;

diff --git a/provider/download-provider-network.c b/provider/download-provider-network.c
index 060b2ea..77dd4a8 100755 (executable)
--- a/provider/download-provider-network.c
+++ b/provider/download-provider-network.c
@@ -26,10 +26,11 @@
 #include <wifi-direct.h>
 #endif
 
-pthread_mutex_t g_dp_network_mutex = PTHREAD_MUTEX_INITIALIZER;
-int g_network_status = DP_NETWORK_OFF;
-connection_h g_network_connection = 0;
-int g_network_is_wifi_direct = 0;
+static pthread_mutex_t g_dp_network_mutex = PTHREAD_MUTEX_INITIALIZER;
+
+static int g_network_status = DP_NETWORK_OFF;
+static connection_h g_network_connection = 0;
+static int g_network_is_wifi_direct = 0;
 
 #ifdef SUPPORT_COMPANION_MODE
 // support B3 companion mode

diff --git a/provider/download-provider-notification-manager.c b/provider/download-provider-notification-manager.c
index 8c9170f..3a7d949 100644 (file)
--- a/provider/download-provider-notification-manager.c
+++ b/provider/download-provider-notification-manager.c
@@ -43,16 +43,16 @@ typedef struct { // manage clients without mutex
 } dp_notification_queue_fmt;
 
 
-pthread_mutex_t g_dp_notification_manager_mutex = PTHREAD_MUTEX_INITIALIZER;
-pthread_cond_t g_dp_notification_manager_cond = PTHREAD_COND_INITIALIZER;
-pthread_t g_dp_notification_manager_tid = 0;
+static pthread_mutex_t g_dp_notification_manager_mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_cond_t g_dp_notification_manager_cond = PTHREAD_COND_INITIALIZER;
+static pthread_t g_dp_notification_manager_tid = 0;
 
 static dp_notification_queue_fmt *g_dp_notification_clear = NULL;
 static dp_notification_queue_fmt *g_dp_notification_ongoing = NULL;
 static dp_notification_queue_fmt *g_dp_notification = NULL;
 
-pthread_mutex_t g_dp_notification_queue_mutex = PTHREAD_MUTEX_INITIALIZER;
-pthread_mutex_t g_dp_notification_queue_ongoing_mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_mutex_t g_dp_notification_queue_mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_mutex_t g_dp_notification_queue_ongoing_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 // normal . push at the tail of queue.
 static int __dp_notification_queue_push(dp_notification_queue_fmt **queue, void *slot, void *request, const int id, const int state, const int noti_priv_id, const double received_size, const double file_size, const dp_noti_type type)

diff --git a/provider/download-provider-notification.c b/provider/download-provider-notification.c
index 6edfac4..beb810f 100755 (executable)
--- a/provider/download-provider-notification.c
+++ b/provider/download-provider-notification.c
@@ -80,7 +80,7 @@
 
 #define DP_MAX_ICONS_TABLE_COUNT 15
 
-char *file_icons_table[DP_MAX_ICONS_TABLE_COUNT] = {
+static char *file_icons_table[DP_MAX_ICONS_TABLE_COUNT] = {
        //unknown file type
        DP_NOTIFICATION_UNKNOWN_ICON_PATH,
        //image

diff --git a/provider/download-provider-plugin-download-agent.c b/provider/download-provider-plugin-download-agent.c
index 3ff0f95..961baa5 100755 (executable)
--- a/provider/download-provider-plugin-download-agent.c
+++ b/provider/download-provider-plugin-download-agent.c
@@ -56,12 +56,12 @@ typedef struct {
        int content_type;
 } mime_table_type;
 
-const char *ambiguous_mime_type_list[] = {
+static const char *ambiguous_mime_type_list[] = {
        "text/plain",
        "application/octet-stream"
 };
 
-mime_table_type mime_table[] = {
+static mime_table_type mime_table[] = {
        // PDF
        {"application/pdf", DP_CONTENT_PDF},
        // word

diff --git a/provider/download-provider-queue-manager.c b/provider/download-provider-queue-manager.c
index a2d05eb..0d5e6c6 100644 (file)
--- a/provider/download-provider-queue-manager.c
+++ b/provider/download-provider-queue-manager.c
@@ -31,9 +31,9 @@
 #include <download-provider-client-manager.h>
 #include <download-provider-plugin-download-agent.h>
 
-pthread_mutex_t g_dp_queue_manager_mutex = PTHREAD_MUTEX_INITIALIZER;
-pthread_cond_t g_dp_queue_manager_cond = PTHREAD_COND_INITIALIZER;
-pthread_t g_dp_queue_manager_tid = 0;
+static pthread_mutex_t g_dp_queue_manager_mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_cond_t g_dp_queue_manager_cond = PTHREAD_COND_INITIALIZER;
+static pthread_t g_dp_queue_manager_tid = 0;
 
 static dp_queue_fmt *g_dp_queue_network_all = NULL;
 static dp_queue_fmt *g_dp_queue_network_wifi = NULL;

diff --git a/provider/download-provider-queue.c b/provider/download-provider-queue.c
index 878a69f..0067b2d 100644 (file)
--- a/provider/download-provider-queue.c
+++ b/provider/download-provider-queue.c
@@ -30,7 +30,7 @@
  */
 
 //dp_queue_fmt *g_dp_queue = NULL; // head of linked list
-pthread_mutex_t g_dp_queue_mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_mutex_t g_dp_queue_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 // normal . push at the tail of queue.
 int dp_queue_push(dp_queue_fmt **queue, void *slot, void *request)