From 60eb5d53967413ce335cf0cfa38612dee3dfb586 Mon Sep 17 00:00:00 2001 From: Arshad Hussain Date: Tue, 6 Aug 2019 18:54:13 +0530 Subject: [PATCH] LU-6142 tests: Fix style issues for openfile.c This patch fixes issues reported by checkpatch for file lustre/tests/openfile.c Test-Parameters: trivial Signed-off-by: Arshad Hussain Change-Id: Ied280e919397d27b087ec9d5ac3c7e55d44ec0b2 Reviewed-on: https://review.whamcloud.com/35911 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Shaun Tancheff Reviewed-by: Petros Koutoupis Reviewed-by: Ben Evans Reviewed-by: Oleg Drokin --- lustre/tests/openfile.c | 257 ++++++++++++++++++++++++------------------------ 1 file changed, 127 insertions(+), 130 deletions(-) diff --git a/lustre/tests/openfile.c b/lustre/tests/openfile.c index c98313e..b01a415 100644 --- a/lustre/tests/openfile.c +++ b/lustre/tests/openfile.c @@ -28,10 +28,6 @@ * Lustre is a trademark of Sun Microsystems, Inc. */ -#if 0 -#define DEBUG -#endif - /* for O_DIRECTORY and O_DIRECT */ #ifndef _GNU_SOURCE #define _GNU_SOURCE @@ -48,163 +44,164 @@ #include typedef struct flag_mapping { - const char *string; - const int flag; + const char *string; + const int flag; } FLAG_MAPPING; FLAG_MAPPING flag_table[] = { - {"O_RDONLY", O_RDONLY}, - {"O_WRONLY", O_WRONLY}, - {"O_RDWR", O_RDWR}, - {"O_CREAT", O_CREAT}, - {"O_EXCL", O_EXCL}, - {"O_NOCTTY", O_NOCTTY}, - {"O_TRUNC", O_TRUNC}, - {"O_APPEND", O_APPEND}, - {"O_NONBLOCK", O_NONBLOCK}, - {"O_NDELAY", O_NDELAY}, - {"O_SYNC", O_SYNC}, + {"O_RDONLY", O_RDONLY}, + {"O_WRONLY", O_WRONLY}, + {"O_RDWR", O_RDWR}, + {"O_CREAT", O_CREAT}, + {"O_EXCL", O_EXCL}, + {"O_NOCTTY", O_NOCTTY}, + {"O_TRUNC", O_TRUNC}, + {"O_APPEND", O_APPEND}, + {"O_NONBLOCK", O_NONBLOCK}, + {"O_NDELAY", O_NDELAY}, + {"O_SYNC", O_SYNC}, #ifdef O_DIRECT - {"O_DIRECT", O_DIRECT}, + {"O_DIRECT", O_DIRECT}, #endif - {"O_LARGEFILE", O_LARGEFILE}, - {"O_DIRECTORY", O_DIRECTORY}, - {"O_NOFOLLOW", O_NOFOLLOW}, - {"O_LOV_DELAY_CREATE", O_LOV_DELAY_CREATE}, - {"", -1} + {"O_LARGEFILE", O_LARGEFILE}, + {"O_DIRECTORY", O_DIRECTORY}, + {"O_NOFOLLOW", O_NOFOLLOW}, + {"O_LOV_DELAY_CREATE", O_LOV_DELAY_CREATE}, + {"", -1} }; void Usage_and_abort(void) { - fprintf(stderr, "Usage: openfile -f flags [ -m mode ] filename \n"); - fprintf(stderr, "e.g. openfile -f O_RDWR:O_CREAT -m 0755 /etc/passwd\n"); - exit(-1); + fprintf(stderr, "Usage: openfile -f flags [ -m mode ] filename\n"); + fprintf(stderr, + "e.g. openfile -f O_RDWR:O_CREAT -m 0755 /etc/passwd\n"); + exit(-1); } -int main(int argc, char** argv) +int main(int argc, char **argv) { - int fd; - int flags = 0; - mode_t mode = 0644; - char *fname = NULL; - int mode_set = 0; - int flag_set = 0; - int c; - int save_errno = 0; - int print_usage = 0; - char *cloned_flags = NULL; - - if (argc == 1) - Usage_and_abort(); - - while ((c = getopt (argc, argv, "f:m:")) != -1) { - switch (c) { - case 'f': { + int fd; + int flags = 0; + mode_t mode = 0644; + char *fname = NULL; + int mode_set = 0; + int flag_set = 0; + int c; + int save_errno = 0; + int print_usage = 0; + char *cloned_flags = NULL; + + if (argc == 1) + Usage_and_abort(); + + while ((c = getopt(argc, argv, "f:m:")) != -1) { + switch (c) { + case 'f': { char *tmp; cloned_flags = strdup(optarg); - if (cloned_flags == NULL) { + if (!cloned_flags) { fprintf(stderr, "Insufficient memory.\n"); save_errno = -1; goto out; } - flags = atoi(cloned_flags); - if (flags > 0) { - flag_set = 1; + flags = atoi(cloned_flags); + if (flags > 0) { + flag_set = 1; #ifdef DEBUG - printf("flags = %d\n",flags); + printf("flags = %d\n", flags); #endif - break; - } else - flags = 0; + break; + } - for (tmp = strtok(cloned_flags, ":|"); tmp; - tmp = strtok(NULL, ":|")) { - int i = 0; + flags = 0; + + for (tmp = strtok(cloned_flags, ":|"); tmp; + tmp = strtok(NULL, ":|")) { + int i = 0; #ifdef DEBUG - printf("flags = %s\n",tmp); + printf("flags = %s\n", tmp); #endif - flag_set = 1; - for (i = 0; flag_table[i].flag != -1; i++) { - if (!strcmp(tmp, flag_table[i].string)){ - flags |= flag_table[i].flag; - break; - } - } - - if (flag_table[i].flag == -1) { - fprintf(stderr, "No such flag: %s\n", - tmp); - save_errno = -1; - goto out; - } - } + flag_set = 1; + for (i = 0; flag_table[i].flag != -1; i++) { + if (!strcmp(tmp, + flag_table[i].string)) { + flags |= flag_table[i].flag; + break; + } + } + + if (flag_table[i].flag == -1) { + fprintf(stderr, "No such flag: %s\n", + tmp); + save_errno = -1; + goto out; + } + } #ifdef DEBUG - printf("flags = %x\n", flags); + printf("flags = %x\n", flags); #endif - break; - } - case 'm': + break; + } + case 'm': #ifdef DEBUG - printf("mode = %s\n", optarg); + printf("mode = %s\n", optarg); #endif - mode = strtol(optarg, NULL, 8); - mode_set = 1; + mode = strtol(optarg, NULL, 8); + mode_set = 1; #ifdef DEBUG - printf("mode = %o\n", mode); + printf("mode = %o\n", mode); #endif - break; - default: - fprintf(stderr, "Bad parameters.\n"); - print_usage = 1; - goto out; - } - } - - if (optind == argc) { - fprintf(stderr, "Bad parameters.\n"); - print_usage = 1; - goto out; - } - - fname = argv[optind]; - - if (!flag_set) { - fprintf(stderr, "Missing flag or file-name\n"); - save_errno = -1; - goto out; - } - - - if (flags & O_CREAT) - fd = open(fname, flags, mode); - else - fd = open(fname, flags); - - save_errno = errno; - - if (fd != -1) { - printf("Succeed in opening file \"%s\"(flags=%s", - fname, cloned_flags); - - if (mode_set) - printf(", mode=%o", mode); - printf(")\n"); - close(fd); - } else { - fprintf(stderr, "Error in opening file \"%s\"(flags=%s", - fname, cloned_flags); - if (mode_set) - fprintf(stderr, ", mode=%o", mode); - fprintf(stderr, ") %d: %s\n", save_errno, strerror(save_errno)); - } - + break; + default: + fprintf(stderr, "Bad parameters.\n"); + print_usage = 1; + goto out; + } + } + + if (optind == argc) { + fprintf(stderr, "Bad parameters.\n"); + print_usage = 1; + goto out; + } + + fname = argv[optind]; + + if (!flag_set) { + fprintf(stderr, "Missing flag or file-name\n"); + save_errno = -1; + goto out; + } + + if (flags & O_CREAT) + fd = open(fname, flags, mode); + else + fd = open(fname, flags); + + save_errno = errno; + + if (fd != -1) { + printf("Succeed in opening file \"%s\"(flags=%s", + fname, cloned_flags); + + if (mode_set) + printf(", mode=%o", mode); + printf(")\n"); + close(fd); + } else { + fprintf(stderr, "Error in opening file \"%s\"(flags=%s", + fname, cloned_flags); + if (mode_set) + fprintf(stderr, ", mode=%o", mode); + fprintf(stderr, ") %d: %s\n", save_errno, strerror(save_errno)); + } out: - if (cloned_flags) - free(cloned_flags); - if (print_usage) - Usage_and_abort(); + if (cloned_flags) + free(cloned_flags); + if (print_usage) + Usage_and_abort(); - return save_errno; + return save_errno; } -- 1.8.3.1