Code clean up of included header files

Change-Id: I04cc2526370c4c1f220795dd941388d150ccd75a

diff --git a/lib/include/media-util-cynara.h b/lib/include/media-util-cynara.h
index a5913d8..3bc9cc2 100755 (executable)
--- a/lib/include/media-util-cynara.h
+++ b/lib/include/media-util-cynara.h
@@ -22,7 +22,6 @@
 #ifndef _MEDIA_UTIL_CYNARA_H_
 #define _MEDIA_UTIL_CYNARA_H_
 
-#include <stdbool.h>
 #include <media-util-ipc.h>
 
 

diff --git a/lib/include/media-util-db.h b/lib/include/media-util-db.h
index f0f807a..8e85fe2 100755 (executable)
--- a/lib/include/media-util-db.h
+++ b/lib/include/media-util-db.h
@@ -27,6 +27,7 @@ extern "C" {
 #endif
 
 #include <stdbool.h>
+#include <sys/types.h>
 
 typedef void MediaDBHandle;            /**< Handle */
 

diff --git a/lib/include/media-util-dcm.h b/lib/include/media-util-dcm.h
index 7eda884..e192458 100755 (executable)
--- a/lib/include/media-util-dcm.h
+++ b/lib/include/media-util-dcm.h
@@ -22,6 +22,8 @@
 extern "C" {
 #endif
 
+#include <sys/types.h>
+
 typedef int (*FaceFunc) (int error_code, int count, void* data);
 
 int dcm_request_extract_all(uid_t uid);

diff --git a/lib/include/media-util-internal.h b/lib/include/media-util-internal.h
index a948e52..033ad19 100755 (executable)
--- a/lib/include/media-util-internal.h
+++ b/lib/include/media-util-internal.h
@@ -22,6 +22,8 @@
 #ifndef _MEDIA_UTIL_INTERNAL_H_
 #define _MEDIA_UTIL_INTERNAL_H_
 
+#include <sqlite3.h>
+
 #include "media-util-db.h"
 
 #ifndef FALSE

diff --git a/lib/include/media-util-register.h b/lib/include/media-util-register.h
index cbaf921..69fea6f 100755 (executable)
--- a/lib/include/media-util-register.h
+++ b/lib/include/media-util-register.h
@@ -24,6 +24,7 @@
 
 #include <glib.h>
 #include <stdbool.h>
+#include <sys/types.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lib/include/media-util-user.h b/lib/include/media-util-user.h
index 9da4203..9a3e5d5 100755 (executable)
--- a/lib/include/media-util-user.h
+++ b/lib/include/media-util-user.h
@@ -24,6 +24,8 @@
 extern "C" {
 #endif
 
+#include <sys/types.h>
+
 typedef enum {
        MS_USER_STORAGE_INTERNAL = 0,   /**< The device's internal storage */
        MS_USER_STORAGE_EXTERNAL = 1,   /**< The device's external storage */

diff --git a/lib/include/media-util.h b/lib/include/media-util.h
index 2e234c0..828325c 100755 (executable)
--- a/lib/include/media-util.h
+++ b/lib/include/media-util.h
@@ -22,6 +22,7 @@
 #ifndef _MEDIA_UTIL_H_
 #define _MEDIA_UTIL_H_
 
+#include <string.h>
 #include <media-util-err.h>
 #include <media-util-register.h>
 #include <media-util-db.h>

diff --git a/lib/media-util-cynara.c b/lib/media-util-cynara.c
index d200137..74d4469 100755 (executable)
--- a/lib/media-util-cynara.c
+++ b/lib/media-util-cynara.c
@@ -28,17 +28,12 @@
  * @brief
  */
 
-#include <errno.h>
 #include <glib.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/socket.h>
 #include <unistd.h>
 
 #include <media-util-cynara.h>
 #include <media-util-dbg.h>
 #include <media-util-err.h>
-#include <media-util-ipc.h>
 #include <media-util-internal.h>
 
 #include <cynara-client.h>

diff --git a/lib/media-util-db.c b/lib/media-util-db.c
index 5c3d5d5..74767e9 100755 (executable)
--- a/lib/media-util-db.c
+++ b/lib/media-util-db.c
@@ -20,8 +20,6 @@
  */
 
 #include <unistd.h>
-#include <string.h>
-#include <errno.h>
 #include <db-util.h>
 #include <sys/stat.h>
 #include <sys/wait.h>

diff --git a/lib/media-util-dcm.c b/lib/media-util-dcm.c
index b197b5a..ebf65b3 100755 (executable)
--- a/lib/media-util-dcm.c
+++ b/lib/media-util-dcm.c
@@ -19,7 +19,6 @@
  *
  */
 
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <glib.h>
@@ -28,9 +27,6 @@
 #include <media-util.h>
 #include <media-util-internal.h>
 #include <media-util-dbg.h>
-#include <media-util-dcm.h>
-#include <media-util-err.h>
-#include <media-util-ipc.h>
 #include <tzplatform_config.h>
 
 static GQueue *g_manage_queue = NULL;

diff --git a/lib/media-util-ipc.c b/lib/media-util-ipc.c
index d7fca71..0ad27d7 100755 (executable)
--- a/lib/media-util-ipc.c
+++ b/lib/media-util-ipc.c
@@ -19,15 +19,10 @@
  *
  */
 
-#include <string.h>
 #include <unistd.h>
-#include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <grp.h>
-#include <pwd.h>
 #include <sys/socket.h>
-#include <sys/un.h>
 
 #include "media-util-dbg.h"
 #include "media-util.h"

diff --git a/lib/media-util-noti-internal.c b/lib/media-util-noti-internal.c
index 550d174..5e179b1 100755 (executable)
--- a/lib/media-util-noti-internal.c
+++ b/lib/media-util-noti-internal.c
@@ -28,18 +28,12 @@
  * @brief
  */
 
-#include <sys/errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <string.h>
 #include <glib.h>
 #include <gio/gio.h>
 
 #include "media-util-internal.h"
 #include "media-util-dbg.h"
 #include "media-util.h"
-#include "media-util-noti-internal.h"
-
 #include "private.h"
 
 GArray *handle_list_internal;

diff --git a/lib/media-util-noti.c b/lib/media-util-noti.c
index cdc326b..02ee13d 100755 (executable)
--- a/lib/media-util-noti.c
+++ b/lib/media-util-noti.c
@@ -19,18 +19,12 @@
  *
  */
 
-#include <sys/errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <string.h>
 #include <glib.h>
-#include <stdlib.h>
 #include <gio/gio.h>
 
 #include "media-util-internal.h"
 #include "media-util-dbg.h"
 #include "media-util.h"
-#include "media-util-noti.h"
 
 #include "private.h"
 

diff --git a/lib/media-util-register.c b/lib/media-util-register.c
index 2f465cc..cfee72c 100755 (executable)
--- a/lib/media-util-register.c
+++ b/lib/media-util-register.c
@@ -19,14 +19,8 @@
  *
  */
 
-#include <errno.h>
 #include <unistd.h>
-#include <arpa/inet.h>
-#include <fcntl.h>
-#include <sys/un.h>
 #include <sys/syscall.h>
-#include <string.h>
-#include <stdbool.h>
 
 #include "media-server-ipc.h"
 #include "media-util-internal.h"

diff --git a/src/common/include/media-common-types.h b/src/common/include/media-common-types.h
index dda3f8c..a2b06df 100755 (executable)
--- a/src/common/include/media-common-types.h
+++ b/src/common/include/media-common-types.h
@@ -27,6 +27,7 @@
 #include <string.h>
 #include <stdbool.h>
 #include <unistd.h>
+#include <glib.h>
 
 #include <tzplatform_config.h>
 

diff --git a/src/common/media-common-external-storage.c b/src/common/media-common-external-storage.c
index ea50dca..5ed5c1a 100755 (executable)
--- a/src/common/media-common-external-storage.c
+++ b/src/common/media-common-external-storage.c
@@ -19,23 +19,12 @@
  *
  */
 
-#include <fcntl.h>
 #include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/syscall.h>
-
 #include <locale.h>
 #include <libintl.h>
 #include <sys/stat.h>
-#include <dirent.h>
-#include <malloc.h>
 #include <vconf.h>
-#include <errno.h>
 #include <glib.h>
-#include <stdlib.h>
-#include <gio/gio.h>
-
 #include <notification.h>
 
 #include "media-util.h"
@@ -45,7 +34,6 @@
 #include "media-common-db-svc.h"
 #include "media-common-external-storage.h"
 
-#include <pwd.h>
 #include <tzplatform_config.h>
 
 #define MMC_INFO_SIZE 256

diff --git a/src/common/media-common-system.c b/src/common/media-common-system.c
index 3266a8c..faae2b0 100755 (executable)
--- a/src/common/media-common-system.c
+++ b/src/common/media-common-system.c
@@ -19,17 +19,11 @@
  *
  */
 
-#include <errno.h>
 #include <glib.h>
-#include <stdint.h>
-#include <stdlib.h>
 #include <gio/gio.h>
-#include <dbus/dbus.h>
-#include <sys/stat.h>
 #include <systemd/sd-login.h>
 
 #include "media-util.h"
-
 #include "media-common-dbg.h"
 #include "media-common-types.h"
 #include "media-common-external-storage.h"

diff --git a/src/common/media-common-utils.c b/src/common/media-common-utils.c
index 8cbbbdc..12189dc 100755 (executable)
--- a/src/common/media-common-utils.c
+++ b/src/common/media-common-utils.c
@@ -21,15 +21,10 @@
 
 #include <sys/types.h>
 #include <fcntl.h>
-#include <errno.h>
 #include <vconf.h>
-#include <grp.h>
-#include <pwd.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib-lowlevel.h>
 #include <sys/statvfs.h>
 #include <sys/stat.h>
+
 #ifdef _SET_VIP_PROCESS
 #include <sys/prctl.h>
 #endif

diff --git a/src/mediadb-update.c b/src/mediadb-update.c
index 4ca3325..5181716 100755 (executable)
--- a/src/mediadb-update.c
+++ b/src/mediadb-update.c
@@ -18,24 +18,18 @@
  * limitations under the License.
  *
  */
-#include <errno.h>
+
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdbool.h>
 #include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <dirent.h>
 #include <dlfcn.h>
 #include <gio/gio.h>
-#include <dbus/dbus.h>
-
+#include <dlfcn.h>
 #include <glib.h>
-#include "media-util.h"
-
 #include <tzplatform_config.h>
 
+#include "media-util.h"
+
 #define MMC_INFO_SIZE 256
 #define BUS_NAME       "org.tizen.system.storage"
 #define OBJECT_PATH    "/Org/Tizen/System/Storage"

diff --git a/src/scanner-v2/include/media-scanner-dbg-v2.h b/src/scanner-v2/include/media-scanner-dbg-v2.h
index d45d756..6864d60 100755 (executable)
--- a/src/scanner-v2/include/media-scanner-dbg-v2.h
+++ b/src/scanner-v2/include/media-scanner-dbg-v2.h
@@ -21,9 +21,6 @@
 
 #ifndef _MEDIA_SCANNER_DBG_V2_H_
 #define _MEDIA_SCANNER_DBG_V2_H_
-#include <sys/syscall.h>
-#include <dlog.h>
-#include <errno.h>
 
 #include "media-common-dbg.h"
 

diff --git a/src/scanner-v2/media-scanner-common-v2.c b/src/scanner-v2/media-scanner-common-v2.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/scanner-v2/media-scanner-db-manage-v2.c b/src/scanner-v2/media-scanner-db-manage-v2.c
index 7049205..97e6865 100755 (executable)
--- a/src/scanner-v2/media-scanner-db-manage-v2.c
+++ b/src/scanner-v2/media-scanner-db-manage-v2.c
@@ -19,10 +19,6 @@
  *
  */
 
-#include <errno.h>
-#include <sys/stat.h>
-#include <sqlite3.h>
-
 #include "media-util.h"
 #include "media-common-utils.h"
 #include "media-common-system.h"

diff --git a/src/scanner-v2/media-scanner-device-block-v2.c b/src/scanner-v2/media-scanner-device-block-v2.c
index 5eaeb72..52dc70a 100755 (executable)
--- a/src/scanner-v2/media-scanner-device-block-v2.c
+++ b/src/scanner-v2/media-scanner-device-block-v2.c
@@ -27,7 +27,6 @@
 #include "media-common-db-svc.h"
 #include "media-common-external-storage.h"
 
-#include "media-util-err.h"
 #include "media-scanner-dbg-v2.h"
 #include "media-scanner-scan-v2.h"
 #include "media-scanner-extract-v2.h"

diff --git a/src/scanner-v2/media-scanner-extract-v2.c b/src/scanner-v2/media-scanner-extract-v2.c
index bda9a02..b1b02ea 100755 (executable)
--- a/src/scanner-v2/media-scanner-extract-v2.c
+++ b/src/scanner-v2/media-scanner-extract-v2.c
@@ -28,7 +28,6 @@
 #include <sys/syscall.h>
 
 #include <dirent.h>
-#include <errno.h>
 #include <malloc.h>
 #include <vconf.h>
 

diff --git a/src/scanner-v2/media-scanner-scan-v2.c b/src/scanner-v2/media-scanner-scan-v2.c
index b19617f..496ef82 100755 (executable)
--- a/src/scanner-v2/media-scanner-scan-v2.c
+++ b/src/scanner-v2/media-scanner-scan-v2.c
@@ -26,11 +26,8 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/syscall.h>
-#include <grp.h>
-#include <pwd.h>
 
 #include <dirent.h>
-#include <errno.h>
 #include <malloc.h>
 #include <vconf.h>
 #ifndef _USE_DEVICED_DBUS

diff --git a/src/scanner-v2/media-scanner-socket-v2.c b/src/scanner-v2/media-scanner-socket-v2.c
index 1d34a96..bc78d65 100755 (executable)
--- a/src/scanner-v2/media-scanner-socket-v2.c
+++ b/src/scanner-v2/media-scanner-socket-v2.c
@@ -19,14 +19,10 @@
  *
  */
 
-#include <arpa/inet.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <errno.h>
-#include <sys/un.h>
 #include <malloc.h>
-#include <vconf.h>
 
 #include "media-util.h"
 #include "media-server-ipc.h"

diff --git a/src/scanner-v2/media-scanner-v2.c b/src/scanner-v2/media-scanner-v2.c
index f0f9f6e..d849d8d 100755 (executable)
--- a/src/scanner-v2/media-scanner-v2.c
+++ b/src/scanner-v2/media-scanner-v2.c
@@ -19,12 +19,10 @@
  *
  */
 
-#include <dirent.h>
 #include <vconf.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <errno.h>
 
 #include "media-common-utils.h"
 #include "media-common-external-storage.h"

diff --git a/src/scanner/include/media-scanner-dbg.h b/src/scanner/include/media-scanner-dbg.h
index 35e2e52..799fe3e 100755 (executable)
--- a/src/scanner/include/media-scanner-dbg.h
+++ b/src/scanner/include/media-scanner-dbg.h
@@ -21,9 +21,6 @@
 
 #ifndef _MEDIA_SCANNER_DBG_H_
 #define _MEDIA_SCANNER_DBG_H_
-#include <sys/syscall.h>
-#include <dlog.h>
-#include <errno.h>
 
 #include "media-common-dbg.h"
 

diff --git a/src/scanner/media-scanner-scan.c b/src/scanner/media-scanner-scan.c
index 2d368fc..bfb129a 100755 (executable)
--- a/src/scanner/media-scanner-scan.c
+++ b/src/scanner/media-scanner-scan.c
@@ -19,15 +19,7 @@
  *
  */
 
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <dirent.h>
-#include <errno.h>
 #include <malloc.h>
-#include <dd-display.h>
-#include <vconf.h>
-#include <grp.h>
-#include <pwd.h>
 
 #include "media-util.h"
 #include "media-server-ipc.h"

diff --git a/src/scanner/media-scanner-socket.c b/src/scanner/media-scanner-socket.c
index d80d0f0..fa637dd 100755 (executable)
--- a/src/scanner/media-scanner-socket.c
+++ b/src/scanner/media-scanner-socket.c
@@ -19,14 +19,10 @@
  *
  */
 
-#include <arpa/inet.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <errno.h>
-#include <sys/un.h>
 #include <malloc.h>
-#include <vconf.h>
 
 #include "media-util.h"
 #include "media-server-ipc.h"

diff --git a/src/scanner/media-scanner.c b/src/scanner/media-scanner.c
index bbce2df..479d195 100755 (executable)
--- a/src/scanner/media-scanner.c
+++ b/src/scanner/media-scanner.c
@@ -19,12 +19,9 @@
  *
  */
 
-#include <dirent.h>
-#include <vconf.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <errno.h>
 
 #include "media-common-utils.h"
 #include "media-common-external-storage.h"

diff --git a/src/server/include/media-server-dbg.h b/src/server/include/media-server-dbg.h
index 5097e15..745d94d 100755 (executable)
--- a/src/server/include/media-server-dbg.h
+++ b/src/server/include/media-server-dbg.h
@@ -22,10 +22,6 @@
 #ifndef _MEDIA_SERVER_DBG_H_
 #define _MEDIA_SERVER_DBG_H_
 
-#include <sys/syscall.h>
-#include <dlog.h>
-#include <errno.h>
-
 #include "media-common-dbg.h"
 
 #ifdef LOG_TAG

diff --git a/src/server/media-server-db-manage.c b/src/server/media-server-db-manage.c
index f35f6d1..aeb938c 100755 (executable)
--- a/src/server/media-server-db-manage.c
+++ b/src/server/media-server-db-manage.c
@@ -19,10 +19,6 @@
  *
  */
 
-#include <errno.h>
-#include <sys/stat.h>
-#include <sqlite3.h>
-
 #include "media-util.h"
 #include "media-common-db-svc.h"
 #include "media-common-system.h"

diff --git a/src/server/media-server-dcm.c b/src/server/media-server-dcm.c
index 46da2f3..6ad56cc 100755 (executable)
--- a/src/server/media-server-dcm.c
+++ b/src/server/media-server-dcm.c
@@ -19,9 +19,6 @@
  *
  */
 
-#include <dirent.h>
-#include <errno.h>
-
 #include "media-util.h"
 #include "media-common-utils.h"
 #include "media-common-system.h"

diff --git a/src/server/media-server-device-block.c b/src/server/media-server-device-block.c
index e59b7d1..08c01b6 100755 (executable)
--- a/src/server/media-server-device-block.c
+++ b/src/server/media-server-device-block.c
@@ -19,7 +19,6 @@
  *
  */
 #include "media-util.h"
-#include <sys/stat.h>
 #include "media-common-db-svc.h"
 #include "media-common-external-storage.h"
 #include "media-common-system.h"

diff --git a/src/server/media-server-main.c b/src/server/media-server-main.c
index 84d0b3f..7abf776 100755 (executable)
--- a/src/server/media-server-main.c
+++ b/src/server/media-server-main.c
@@ -21,15 +21,9 @@
 
 #include <sys/wait.h>
 #include <sys/types.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#include <errno.h>
 #include <malloc.h>
 #include <vconf.h>
-#include <grp.h>
-#include <pwd.h>
 #include <iniparser.h>
-#include <system_info.h>
 
 #include "media-util.h"
 #include "media-common-utils.h"

diff --git a/src/server/media-server-scanner.c b/src/server/media-server-scanner.c
index 4f64a27..ed9c8dd 100755 (executable)
--- a/src/server/media-server-scanner.c
+++ b/src/server/media-server-scanner.c
@@ -18,9 +18,7 @@
  * limitations under the License.
  *
  */
-#include <errno.h>
-#include <stdbool.h>
-#include <unistd.h>
+
 #include <glib.h>
 #include <vconf.h>
 #include <sys/types.h>

diff --git a/src/server/media-server-socket.c b/src/server/media-server-socket.c
index 765040c..ba0e851 100755 (executable)
--- a/src/server/media-server-socket.c
+++ b/src/server/media-server-socket.c
@@ -19,17 +19,10 @@
  *
  */
 
-#include <arpa/inet.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/socket.h>
 #include <fcntl.h>
-#include <sys/un.h>
-#include <errno.h>
 #include <malloc.h>
-#include <vconf.h>
-#include <grp.h>
-#include <pwd.h>
 
 #include "media-util.h"
 #include "media-util-internal.h"

diff --git a/src/server/media-server-thumb.c b/src/server/media-server-thumb.c
index 1da3fb7..89a7a2a 100755 (executable)
--- a/src/server/media-server-thumb.c
+++ b/src/server/media-server-thumb.c
@@ -19,9 +19,6 @@
  *
  */
 
-#include <dirent.h>
-#include <errno.h>
-
 #include "media-util.h"
 #include "media-common-utils.h"
 #include "media-server-dbg.h"