From 49e6771fa096c14cb5feab95ad68e7bedee19cb4 Mon Sep 17 00:00:00 2001
From: Hyotaek Shim <hyotaek.shim@samsung.com>
Date: Fri, 10 Aug 2018 11:12:15 +0900
Subject: [PATCH] Fix some #define and add comments regarding
 _FILE_OFFSET_BITS=32/64

Change-Id: I7849e96b6a1e006685e2c6be953b0092dc953f86
Signed-off-by: Hyotaek Shim <hyotaek.shim@samsung.com>
---
 include/storage.h      | 24 +++++++++---------------
 src/statvfs.c          |  4 ++++
 src/storage-external.c |  6 +++---
 src/storage-internal.c | 12 ++++++------
 4 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/include/storage.h b/include/storage.h
index 0665cf3..1b3cbec 100644
--- a/include/storage.h
+++ b/include/storage.h
@@ -63,14 +63,11 @@ extern "C" {
  *	...
  * @endcode
  */
-#ifndef __USE_FILE_OFFSET64
-extern int storage_get_internal_memory_size(struct statvfs *buf);
-#else
-# define storage_get_internal_memory_size storage_get_internal_memory_size64
-#endif
-
 #ifdef __USE_FILE_OFFSET64
+#define storage_get_internal_memory_size storage_get_internal_memory_size64
 extern int storage_get_internal_memory_size64(struct statvfs *buf);
+#else
+extern int storage_get_internal_memory_size(struct statvfs *buf);
 #endif
 
 
@@ -93,20 +90,17 @@ extern int storage_get_internal_memory_size64(struct statvfs *buf);
  *	...
  * @endcode
  */
-#ifndef __USE_FILE_OFFSET64
-extern int storage_get_external_memory_size(struct statvfs *buf);
-#else
-# ifdef __REDIRECT_NTH
+#ifdef __USE_FILE_OFFSET64
+#ifdef __REDIRECT_NTH
 extern int __REDIRECT_NTH(storage_get_external_memory_size,
 				(struct statvfs *buf), storage_get_external_memory_size64)
 	__nonnull((1));
-# else
-#  define storage_get_external_memory_size storage_get_external_memory_size64
-# endif
+#else
+#define storage_get_external_memory_size storage_get_external_memory_size64
 #endif
-
-#ifdef __USE_FILE_OFFSET64
 extern int storage_get_external_memory_size64(struct statvfs *buf);
+#else
+extern int storage_get_external_memory_size(struct statvfs *buf);
 #endif
 
 
diff --git a/src/statvfs.c b/src/statvfs.c
index 3ec9ace..0085d49 100644
--- a/src/statvfs.c
+++ b/src/statvfs.c
@@ -223,6 +223,7 @@ static int get_memory_size(const char *path, struct statvfs_32 *buf)
 	return 0;
 }
 
+/* This api is intended for binaries built with _FILE_OFFSET_BITS=32 */
 API int storage_get_internal_memory_size(struct statvfs *buf)
 {
 	struct statvfs_32 temp;
@@ -257,6 +258,7 @@ API int storage_get_internal_memory_size(struct statvfs *buf)
 	return 0;
 }
 
+/* This api is intended for binaries built with __USE_FILE_OFFSET64(_FILE_OFFSET_BITS=64) */
 API int storage_get_internal_memory_size64(struct statvfs *buf)
 {
 	static unsigned long reserved = 0;
@@ -313,6 +315,7 @@ static int get_external_path(char *path, size_t len)
 	return storage_ext_get_primary_mmc_path(path, len);
 }
 
+/* This api is intended for binaries built with _FILE_OFFSET_BITS=32 */
 int storage_get_external_memory_size_with_path(char *path, struct statvfs *buf)
 {
 	struct statvfs_32 temp;
@@ -358,6 +361,7 @@ out_nodev:
 	return 0;
 }
 
+/* This api is intended for binaries built with __USE_FILE_OFFSET64(_FILE_OFFSET_BITS=64) */
 int storage_get_external_memory_size64_with_path(char *path, struct statvfs *buf)
 {
 	int ret;
diff --git a/src/storage-external.c b/src/storage-external.c
index aee5d6c..a0647a5 100755
--- a/src/storage-external.c
+++ b/src/storage-external.c
@@ -105,10 +105,10 @@ int storage_ext_get_space(int storage_id,
 	}
 
 	if (state >= STORAGE_STATE_MOUNTED) {
-#ifndef __USE_FILE_OFFSET64
-		ret = storage_get_external_memory_size_with_path(dev->mount_point, &s);
-#else
+#ifdef __USE_FILE_OFFSET64
 		ret = storage_get_external_memory_size64_with_path(dev->mount_point, &s);
+#else
+		ret = storage_get_external_memory_size_with_path(dev->mount_point, &s);
 #endif
 		if (ret < 0) {
 			_E("Failed to get external memory size of (%s)(ret:%d)", dev->mount_point, ret); //LCOV_EXCL_LINE
diff --git a/src/storage-internal.c b/src/storage-internal.c
index 0dadec9..2f8a796 100755
--- a/src/storage-internal.c
+++ b/src/storage-internal.c
@@ -29,10 +29,10 @@
 #include "common.h"
 #include "log.h"
 
-#ifndef __USE_FILE_OFFSET64
-int __WEAK__ storage_get_internal_memory_size(struct statvfs *buf);
-#else
+#ifdef __USE_FILE_OFFSET64
 int __WEAK__ storage_get_internal_memory_size64(struct statvfs *buf);
+#else
+int __WEAK__ storage_get_internal_memory_size(struct statvfs *buf);
 #endif
 
 static int internal_get_state(void)
@@ -45,10 +45,10 @@ static int internal_get_space(unsigned long long *total, unsigned long long *ava
 	struct statvfs s;
 	int ret;
 
-#ifndef __USE_FILE_OFFSET64
-	ret = storage_get_internal_memory_size(&s);
-#else
+#ifdef __USE_FILE_OFFSET64
 	ret = storage_get_internal_memory_size64(&s);
+#else
+	ret = storage_get_internal_memory_size(&s);
 #endif
 	if (ret < 0)
 		return -EPERM;
-- 
2.7.4