[Ocfs2-test-devel] [PATCH 25/59] inline-data: do some cleanup
Junxiao Bi
junxiao.bi at oracle.com
Sun Sep 13 19:44:11 PDT 2015
From: Jeff Liu <jeff.liu at oracle.com>
- fix a dozens sparse warnings.
- Add a couple of missing output variable for debugging purpose.
Signed-off-by: Jie Liu <jeff.liu at oracle.com>
Signed-off-by: Junxiao Bi <junxiao.bi at oracle.com>
---
programs/inline-data/inline-data-utils.c | 16 +++++++++-------
programs/inline-data/inline-data.c | 2 +-
programs/inline-data/inline-dirs-utils.c | 4 ++--
programs/inline-data/inline-dirs.c | 23 ++++++++++++++---------
programs/inline-data/multi-inline-data.c | 4 ++--
programs/inline-data/multi-inline-dirs.c | 6 +++---
6 files changed, 31 insertions(+), 24 deletions(-)
diff --git a/programs/inline-data/inline-data-utils.c b/programs/inline-data/inline-data-utils.c
index 0e1489e..217844d 100644
--- a/programs/inline-data/inline-data-utils.c
+++ b/programs/inline-data/inline-data-utils.c
@@ -109,7 +109,6 @@ int extend_pattern(int fd, unsigned int old_size, unsigned int new_size)
{
int bytes = new_size - old_size;
int ret;
- int i;
memset(pattern + old_size, 0, bytes);
@@ -210,7 +209,7 @@ int write_at(int fd, const void *buf, size_t count, off_t offset)
}
if (ret != count) {
- fprintf(stderr, "Short write: wanted %d, got %d\n", count, ret);
+ fprintf(stderr, "Short write: wanted %zu, got %d\n", count, ret);
return -1;
}
@@ -325,8 +324,9 @@ int verify_pattern_mmap(int fd, unsigned int size)
int uuid2dev(const char *uuid, char *dev)
{
- FILE *df;
char cmd[300];
+ FILE *df;
+ int ret;
snprintf(cmd, 300, "/sbin/blkid |grep %s|cut -d':' -f1", uuid);
@@ -337,10 +337,12 @@ int uuid2dev(const char *uuid, char *dev)
return -1;
}
- fscanf(df, "%s\n", dev);
-
+ ret = fscanf(df, "%s\n", dev);
pclose(df);
+ if (ret != 1)
+ return -1;
+
return 0;
}
@@ -432,7 +434,7 @@ int should_inlined_or_not(int is_inlined, int should_inlined, int test_no)
if (!is_inlined) {
fprintf(stderr, "After Test #%d, file %s should be "
"inlined here!\n", test_no, file_name);
- fprintf(stderr, "File(%s): i_size = %d,id_count = %d\n",
+ fprintf(stderr, "File(%s): i_size = %lu, id_count = %d\n",
file_name, i_size, id_count);
return -1;
}
@@ -441,7 +443,7 @@ int should_inlined_or_not(int is_inlined, int should_inlined, int test_no)
if (is_inlined) {
fprintf(stderr, "After Test #%d, file %s should be "
"extented here!\n", test_no, file_name);
- fprintf(stderr, "File(%s): i_size = %d,id_count = %d\n",
+ fprintf(stderr, "File(%s): i_size = %lu, id_count = %d\n",
file_name, i_size, id_count);
return -1;
diff --git a/programs/inline-data/inline-data.c b/programs/inline-data/inline-data.c
index 4894fcf..a8b2b76 100644
--- a/programs/inline-data/inline-data.c
+++ b/programs/inline-data/inline-data.c
@@ -235,7 +235,7 @@ static int setup(int argc, char *argv[])
mkdir(work_place, FILE_MODE);
printf("BlockSize:\t\t%d\nMax Inline Data Size:\t%d\n"
- "ClusterSize:\t\t%d\nPageSize:\t\t%d\nWorkingPlace:\t\t%s\n\n",
+ "ClusterSize:\t\t%lu\nPageSize:\t\t%lu\nWorkingPlace:\t\t%s\n\n",
blocksize, max_inline_size, clustersize, page_size, work_place);
return 0;
diff --git a/programs/inline-data/inline-dirs-utils.c b/programs/inline-data/inline-dirs-utils.c
index e0d0545..db63b4a 100644
--- a/programs/inline-data/inline-dirs-utils.c
+++ b/programs/inline-data/inline-dirs-utils.c
@@ -572,7 +572,7 @@ void should_inlined_or_not(int is_inlined, int should_inlined, int test_no)
if (!is_inlined) {
fprintf(stderr, "After Test #%d, dir %s should be "
"inlined here!\n", test_no, dir_name);
- fprintf(stderr, "Dir(%s): i_size = %d,id_count = %d\n",
+ fprintf(stderr, "Dir(%s): i_size = %lu, id_count = %d\n",
dir_name, i_size, id_count);
exit(-1);
}
@@ -581,7 +581,7 @@ void should_inlined_or_not(int is_inlined, int should_inlined, int test_no)
if (is_inlined) {
fprintf(stderr, "After Test #%d, dir %s should be "
"extented here!\n", test_no, dir_name);
- fprintf(stderr, "Dir(%s): i_size = %d,id_count = %d\n",
+ fprintf(stderr, "Dir(%s): i_size = %lu, id_count = %d\n",
dir_name, i_size, id_count);
exit(-1);
diff --git a/programs/inline-data/inline-dirs.c b/programs/inline-data/inline-dirs.c
index d7a4510..0024914 100644
--- a/programs/inline-data/inline-dirs.c
+++ b/programs/inline-data/inline-dirs.c
@@ -309,7 +309,7 @@ static void run_large_dir_tests(void)
should_inlined_or_not(ret, 0, testno);
/*verify i_size should be one block size here*/
if (i_size != blocksize) {
- fprintf(stderr, "i_size should be %d,while it's % here!\n",
+ fprintf(stderr, "i_size should be %d, while it's %lu here!\n",
blocksize, i_size);
}
destroy_dir();
@@ -328,7 +328,7 @@ static void run_large_dir_tests(void)
should_inlined_or_not(ret, 0, testno);
/*verify i_size should be one block size here*/
if (i_size != blocksize * 2) {
- fprintf(stderr, "i_size should be %d,while it's % here!\n",
+ fprintf(stderr, "i_size should be %d, while it's %lu here!\n",
blocksize * 2, i_size);
}
destroy_dir();
@@ -443,6 +443,11 @@ static int semaphore_v(void)
return 0;
}
+#if 0
+/*
+ * This function is not in use for now, comment it out to suppress
+ * compiler warning.
+ */
static void del_semvalue(void)
{
union semun sem_union;
@@ -450,15 +455,16 @@ static void del_semvalue(void)
if (semctl(sem_id, 0, IPC_RMID, sem_union) == -1)
fprintf(stderr, "Failed to delete semaphore\n");
}
+#endif
static void run_concurrent_test(void)
{
- int ret, rc;
- int i, j, status;
- struct my_dirent *old_dirents;
key_t sem_key = IPC_PRIVATE, shm_key = IPC_PRIVATE;
-
+ struct my_dirent *old_dirents;
pid_t pid;
+ int i, status;
+ int ret, rc;
+
if (!do_multi_process_test)
return;
@@ -556,9 +562,8 @@ static void run_concurrent_test(void)
static void run_multiple_test(void)
{
- int i, j, status;
-
pid_t pid;
+ int i, status;
int ret, rc;
if (!do_multi_file_test)
@@ -658,7 +663,7 @@ static void setup(int argc, char *argv[])
snprintf(dir_name, 255, "%s/%s", work_place, dirent_name);
printf("BlockSize:\t\t%d\nMax Inline Data Size:\t%d\n"
- "ClusterSize:\t\t%d\nPageSize:\t\t%d\nWorkingPlace:\t\t%s\n"
+ "ClusterSize:\t\t%lu\nPageSize:\t\t%lu\nWorkingPlace:\t\t%s\n"
"NumOfMaxInlinedEntries:\t\t%d\n\n", blocksize, max_inline_size,
clustersize, page_size, work_place,
get_max_inlined_entries(max_inline_size));
diff --git a/programs/inline-data/multi-inline-data.c b/programs/inline-data/multi-inline-data.c
index 41eddf1..5a37805 100755
--- a/programs/inline-data/multi-inline-data.c
+++ b/programs/inline-data/multi-inline-data.c
@@ -204,7 +204,7 @@ static int should_inlined_or_not(int is_inlined, int should_inlined,
if (!is_inlined) {
fprintf(stderr, "After Test #%d, file %s should be "
"inlined here!\n", test_no, file_name);
- fprintf(stderr, "File(%s): i_size = %d,id_count = %d\n",
+ fprintf(stderr, "File(%s): i_size = %lu, id_count = %d\n",
file_name, i_size, id_count);
abort_printf("A extented file detected!\n");
}
@@ -213,7 +213,7 @@ static int should_inlined_or_not(int is_inlined, int should_inlined,
if (is_inlined) {
fprintf(stderr, "After Test #%d, file %s should be "
"extented here!\n", test_no, file_name);
- fprintf(stderr, "File(%s): i_size = %d,id_count = %d\n",
+ fprintf(stderr, "File(%s): i_size = %lu,id_count = %d\n",
file_name, i_size, id_count);
abort_printf("A inlined file detected!\n");
diff --git a/programs/inline-data/multi-inline-dirs.c b/programs/inline-data/multi-inline-dirs.c
index 8c58c25..5c1b029 100644
--- a/programs/inline-data/multi-inline-dirs.c
+++ b/programs/inline-data/multi-inline-dirs.c
@@ -663,7 +663,7 @@ static void should_inlined_or_not(int is_inlined, int should_inlined,
if (!is_inlined) {
fprintf(stderr, "After Test #%d, dir %s should be "
"inlined here!\n", test_no, dir_name);
- fprintf(stderr, "Dir(%s): i_size = %d,id_count = %d\n",
+ fprintf(stderr, "Dir(%s): i_size = %lu,id_count = %d\n",
dir_name, i_size, id_count);
abort_printf("inline-data check failed!\n");
}
@@ -672,7 +672,7 @@ static void should_inlined_or_not(int is_inlined, int should_inlined,
if (is_inlined) {
fprintf(stderr, "After Test #%d, dir %s should be "
"extented here!\n", test_no, dir_name);
- fprintf(stderr, "Dir(%s): i_size = %d,id_count = %d\n",
+ fprintf(stderr, "Dir(%s): i_size = %lu,id_count = %d\n",
dir_name, i_size, id_count);
abort_printf("inline-data check failed!\n");
@@ -1048,7 +1048,7 @@ static void run_large_dir_tests(void)
should_inlined_or_not(ret, 0, testno);
/*verify i_size should be one block size here*/
if (i_size != blocksize * 2) {
- fprintf(stderr, "i_size should be %d,while it's %d here!\n",
+ fprintf(stderr, "i_size should be %d, while it's %lu here!\n",
blocksize * 2, i_size);
}
--
1.7.9.5
More information about the Ocfs2-test-devel
mailing list