From 5e880504a03001ee387e876f0e9dbc413ded2344 Mon Sep 17 00:00:00 2001 From: Arshad Hussain Date: Tue, 6 Aug 2019 02:31:57 +0530 Subject: [PATCH] LU-6142 tests: Fix style issues for checkstat.c This patch fixes issues reported by checkpatch for file lustre/tests/checkstat.c Test-Parameters: trivial Signed-off-by: Arshad Hussain Change-Id: I2ed9c9b4325f9285643a21114dbaf2e1e48c1757 Reviewed-on: https://review.whamcloud.com/35814 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Shaun Tancheff Reviewed-by: Petros Koutoupis Reviewed-by: Oleg Drokin --- lustre/tests/checkstat.c | 339 ++++++++++++++++++++++------------------------- 1 file changed, 158 insertions(+), 181 deletions(-) diff --git a/lustre/tests/checkstat.c b/lustre/tests/checkstat.c index efc3afc..b1e869e 100644 --- a/lustre/tests/checkstat.c +++ b/lustre/tests/checkstat.c @@ -46,62 +46,60 @@ #include void -usage (char *argv0, int help) +usage(char *argv0, int help) { char *progname = strrchr(argv0, '/'); - if (progname == NULL) + if (!progname) progname = argv0; - fprintf (help ? stdout : stderr, - "Usage: %s [flags] file[s]\n", - progname); + fprintf(help ? stdout : stderr, + "Usage: %s [flags] file[s]\n", + progname); - if (!help) - { - fprintf (stderr, " or try '-h' for help\n"); - exit (1); + if (!help) { + fprintf(stderr, " or try '-h' for help\n"); + exit(1); } - printf ("Check given files have...\n"); - printf (" -p permission file must have required permissions\n"); - printf (" -t dir|file|link file must be of the specified type\n"); - printf (" -l link_name file must be a link to the given name\n"); - printf (" -s size file must have the given size\n"); - printf (" -u user file must be owned by given user\n"); - printf (" -g group file must be owned by given group\n"); - printf (" -f follow symlinks\n"); - printf (" -a file must be absent\n"); - printf (" -v increase verbosity\n"); - printf (" -h print help\n"); - printf (" Exit status is 0 on success, 1 on failure\n"); + printf("Check given files have...\n"); + printf(" -p permission file must have required permissions\n"); + printf(" -t dir|file|link file must be of the specified type\n"); + printf(" -l link_name file must be a link to the given name\n"); + printf(" -s size file must have the given size\n"); + printf(" -u user file must be owned by given user\n"); + printf(" -g group file must be owned by given group\n"); + printf(" -f follow symlinks\n"); + printf(" -a file must be absent\n"); + printf(" -v increase verbosity\n"); + printf(" -h print help\n"); + printf(" Exit status is 0 on success, 1 on failure\n"); } int -main (int argc, char **argv) +main(int argc, char **argv) { - int c; + int c; struct stat64 buf; - int perms = -1; - uid_t uid = (uid_t)-1; - gid_t gid = (gid_t)-1; - char *type = NULL; - long absent = 0; - char *checklink = NULL; - int verbose = 0; - long long size = -1; - int follow = 0; - char *term; - - while ((c = getopt (argc, argv, "p:t:l:s:u:g:avfh")) != -1) - switch (c) - { + int perms = -1; + uid_t uid = (uid_t)-1; + gid_t gid = (gid_t)-1; + char *type = NULL; + long absent = 0; + char *checklink = NULL; + int verbose = 0; + long long size = -1; + int follow = 0; + char *term; + + while ((c = getopt(argc, argv, "p:t:l:s:u:g:avfh")) != -1) + switch (c) { case 'p': - perms = (int)strtol (optarg, &term, 0); - if (term == optarg) - { - fprintf (stderr, "Can't parse permission %s\n", optarg); - return (1); + perms = (int)strtol(optarg, &term, 0); + if (term == optarg) { + fprintf(stderr, "Can't parse permission %s\n", + optarg); + return 1; } break; @@ -110,51 +108,54 @@ main (int argc, char **argv) break; case 's': - size = strtoll (optarg, &term, 0); - if (term == optarg) - { - fprintf (stderr, "Can't parse size %s\n", optarg); - return (1); + size = strtoll(optarg, &term, 0); + if (term == optarg) { + fprintf(stderr, "Can't parse size %s\n", + optarg); + return 1; } break; case 'u': - if (*optarg == '#') - { - uid = (uid_t)strtol (optarg + 1, &term, 0); - if (term == optarg + 1) - { - fprintf (stderr, "Can't parse numeric uid %s\n", optarg); - return (1); + if (*optarg == '#') { + uid = (uid_t)strtol(optarg + 1, &term, 0); + + if (term == optarg + 1) { + fprintf(stderr, + "Can't parse numeric uid %s\n", + optarg); + return 1; } } else { - struct passwd *pw = getpwnam (optarg); + struct passwd *pw = getpwnam(optarg); - if (pw == NULL) - { - fprintf (stderr, "Can't find user %s\n", optarg); - return (1); + if (!pw) { + fprintf(stderr, "Can't find user %s\n", + optarg); + return 1; } uid = pw->pw_uid; } break; case 'g': - if (*optarg == '#') - { - gid = (gid_t)strtol (optarg + 1, &term, 0); - if (term == optarg + 1) - { - fprintf (stderr, "Can't parse numeric gid %s\n", optarg); - return (1); + if (*optarg == '#') { + gid = (gid_t)strtol(optarg + 1, &term, 0); + + if (term == optarg + 1) { + fprintf(stderr, + "Can't parse numeric gid %s\n", + optarg); + return 1; } } else { - struct group *gr = getgrnam (optarg); + struct group *gr = getgrnam(optarg); - if (gr == NULL) - { - fprintf (stderr, "Can't find group %s\n", optarg); - return (1); + if (!gr) { + fprintf(stderr, + "Can't find group %s\n", + optarg); + return 1; } uid = gr->gr_gid; } @@ -177,176 +178,152 @@ main (int argc, char **argv) break; case 'h': - usage (argv[0], 1); - return (0); + usage(argv[0], 1); + return 0; default: - usage (argv[0], 0); + usage(argv[0], 0); } if (optind == argc) - usage (argv[0], 0); + usage(argv[0], 0); - do - { + do { char *fname = argv[optind]; - int rc = follow ? stat64 (fname, &buf) : lstat64 (fname, &buf); + int rc = follow ? stat64(fname, &buf) : lstat64(fname, &buf); - if (rc != 0) - { - if (!(absent && errno == ENOENT)) - { + if (rc != 0) { + if (!(absent && errno == ENOENT)) { if (verbose) - printf ("Can't %sstat %s: %s\n", - follow ? "" : "l", - fname, strerror (errno)); - return (1); + printf("Can't %sstat %s: %s\n", + follow ? "" : "l", + fname, strerror(errno)); + return 1; } if (verbose) - printf ("%s: absent OK\n", fname); + printf("%s: absent OK\n", fname); continue; } - if (absent) - { + if (absent) { if (verbose) - printf ("%s exists\n", fname); - return (1); + printf("%s exists\n", fname); + return 1; } - if (type != NULL) - { - if (!strcmp (type, "d") || - !strcmp (type, "dir")) - { - if (!S_ISDIR (buf.st_mode)) - { + if (type) { + if (!strcmp(type, "d") || + !strcmp(type, "dir")) { + if (!S_ISDIR(buf.st_mode)) { if (verbose) - printf ("%s is not a directory\n", - fname); - return (1); + printf("%s is not a directory\n", + fname); + return 1; } - } - else if (!strcmp (type, "f") || - !strcmp (type, "file")) - { - if (!S_ISREG (buf.st_mode)) - { + } else if (!strcmp(type, "f") || + !strcmp(type, "file")) { + if (!S_ISREG(buf.st_mode)) { if (verbose) - printf ("%s is not a regular file\n", - fname); - return (1); + printf("%s is not a regular file\n", + fname); + return 1; } - } - else if (!strcmp (type, "l") || - !strcmp (type, "link")) - { - if (!S_ISLNK (buf.st_mode)) - { + } else if (!strcmp(type, "l") || + !strcmp(type, "link")) { + if (!S_ISLNK(buf.st_mode)) { if (verbose) - printf ("%s is not a link\n", - fname); - return (1); + printf("%s is not a link\n", + fname); + return 1; } - } - else - { - fprintf (stderr, "Can't parse file type %s\n", - type); - return (1); + } else { + fprintf(stderr, "Can't parse file type %s\n", + type); + return 1; } if (verbose) - printf ("%s has type %s OK\n", fname, type); + printf("%s has type %s OK\n", fname, type); } - if (perms != -1) - { - if ((buf.st_mode & ~S_IFMT) != perms) - { + if (perms != -1) { + if ((buf.st_mode & ~S_IFMT) != perms) { if (verbose) - printf ("%s has perms 0%o, not 0%o\n", - fname, (buf.st_mode & ~S_IFMT), - perms); - return (1); + printf("%s has perms 0%o, not 0%o\n", + fname, (buf.st_mode & ~S_IFMT), + perms); + return 1; } if (verbose) - printf ("%s has perms 0%o OK\n", - fname, perms); + printf("%s has perms 0%o OK\n", + fname, perms); } - if (size != -1) { - if (buf.st_size != size) { - if (verbose) - printf("%s has size %lld, not %lld\n", - fname, (long long)buf.st_size, - size); - return 1; - } + if (size != -1) { + if (buf.st_size != size) { + if (verbose) + printf("%s has size %lld, not %lld\n", + fname, (long long)buf.st_size, + size); + return 1; + } - if (verbose) - printf("%s has size %lld OK\n", fname, size); - } + if (verbose) + printf("%s has size %lld OK\n", fname, size); + } - if (checklink != NULL) - { - static char lname[4<<10]; + if (checklink) { + static char lname[4 << 10]; - rc = readlink (fname, lname, sizeof (lname) - 1); + rc = readlink(fname, lname, sizeof(lname) - 1); - if (rc < 0) - { + if (rc < 0) { if (verbose) - printf ("%s: can't read link: %s\n", - fname, strerror (errno)); - return (1); + printf("%s: can't read link: %s\n", + fname, strerror(errno)); + return 1; } lname[rc] = 0; - if (strcmp (checklink, lname)) - { + if (strcmp(checklink, lname)) { if (verbose) - printf ("%s is a link to %s and not %s\n", - fname, lname, checklink); - return (1); + printf("%s is a link to %s and not %s\n", + fname, lname, checklink); + return 1; } if (verbose) - printf ("%s links to %s OK\n", fname, checklink); + printf("%s links to %s OK\n", fname, checklink); } - if (uid != (uid_t)-1) - { - if (buf.st_uid != uid) - { + if (uid != (uid_t)-1) { + if (buf.st_uid != uid) { if (verbose) - printf ("%s is owned by user #%ld and not #%ld\n", - fname, (long)buf.st_uid, (long)uid); - return (1); + printf("%s is owned by user #%ld and not #%ld\n", + fname, (long)buf.st_uid, (long)uid); + return 1; } if (verbose) - printf ("%s is owned by user #%ld OK\n", - fname, (long)uid); + printf("%s is owned by user #%ld OK\n", + fname, (long)uid); } - if (gid != (gid_t)-1) - { - if (buf.st_gid != gid) - { + if (gid != (gid_t)-1) { + if (buf.st_gid != gid) { if (verbose) - printf ("%s is owned by group #%ld and not #%ld\n", - fname, (long)buf.st_gid, (long)gid); - return (1); + printf("%s is owned by group #%ld and not #%ld\n", + fname, (long)buf.st_gid, (long)gid); + return 1; } if (verbose) - printf ("%s is owned by group #%ld OK\n", - fname, (long)gid); + printf("%s is owned by group #%ld OK\n", + fname, (long)gid); } } while (++optind < argc); - return (0); + return 0; } -- 1.8.3.1