From: Michal Simek <[email protected]>
Signed-off-by: Michal Simek <[email protected]> --- testcases/kernel/fs/inode/inode02.c | 2 +- testcases/kernel/fs/scsi/ltpfs/main.c | 2 +- testcases/kernel/fs/scsi/ltpscsi/scsimain.c | 2 +- testcases/kernel/mem/hugetlb/hugemmap/hugemmap03.c | 2 +- testcases/kernel/mem/mmapstress/mmapstress01.c | 2 +- testcases/kernel/mem/mmapstress/mmapstress09.c | 2 +- testcases/kernel/mem/mmapstress/mmapstress10.c | 2 +- testcases/kernel/mem/page/page01.c | 2 +- testcases/kernel/sched/nptl/nptl01.c | 2 +- testcases/kernel/sched/sched_stress/sched_tc6.c | 4 +- testcases/kernel/syscalls/abort/abort01.c | 2 +- testcases/kernel/syscalls/fcntl/fcntl07.c | 2 +- testcases/kernel/syscalls/fcntl/fcntl07B.c | 2 +- testcases/kernel/syscalls/fcntl/fcntl15.c | 22 +++++++++--------- testcases/kernel/syscalls/fcntl/fcntl16.c | 14 +++++----- testcases/kernel/syscalls/fcntl/fcntl17.c | 24 ++++++++++---------- testcases/kernel/syscalls/symlink/symlink01.c | 18 +++++++------- 17 files changed, 53 insertions(+), 53 deletions(-) diff --git a/testcases/kernel/fs/inode/inode02.c b/testcases/kernel/fs/inode/inode02.c index 0927ddc..9d52094 100644 --- a/testcases/kernel/fs/inode/inode02.c +++ b/testcases/kernel/fs/inode/inode02.c @@ -911,6 +911,6 @@ instress() { tst_resm(TINFO, "System resource may be too low, fork() malloc()" " etc are likely to fail.\n"); - return(1); + return 1; } diff --git a/testcases/kernel/fs/scsi/ltpfs/main.c b/testcases/kernel/fs/scsi/ltpfs/main.c index 6b0d693..e99c1f3 100644 --- a/testcases/kernel/fs/scsi/ltpfs/main.c +++ b/testcases/kernel/fs/scsi/ltpfs/main.c @@ -485,7 +485,7 @@ int do_random_access_test(int maxNum) if ( maxNum < 1 || maxNum > MAXNUM ) { printf("out of size %d\n",maxNum); - return(1); + return 1; } time(&t); diff --git a/testcases/kernel/fs/scsi/ltpscsi/scsimain.c b/testcases/kernel/fs/scsi/ltpscsi/scsimain.c index f7558cc..e9eb13b 100644 --- a/testcases/kernel/fs/scsi/ltpscsi/scsimain.c +++ b/testcases/kernel/fs/scsi/ltpscsi/scsimain.c @@ -5807,7 +5807,7 @@ int show_scsi_info(char * device) fprintf(stderr, "file=%s, or no corresponding sg device found\n", device); fprintf(stderr, "Is sg driver loaded?\n"); } - return(1); + return 1; } diff --git a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap03.c b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap03.c index 60e75da..a2cddf5 100644 --- a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap03.c +++ b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap03.c @@ -81,7 +81,7 @@ main(int ac, char **av) tst_resm(TCONF,"This test is only for 64bit"); tst_exit(); /*NOTREACHED*/ - return(1); + return 1; #else /* 64-bit compiled */ int lc; /* loop counter */ char *msg; /* message returned from parse_opts */ diff --git a/testcases/kernel/mem/mmapstress/mmapstress01.c b/testcases/kernel/mem/mmapstress/mmapstress01.c index 863612f..fa89561 100644 --- a/testcases/kernel/mem/mmapstress/mmapstress01.c +++ b/testcases/kernel/mem/mmapstress/mmapstress01.c @@ -695,7 +695,7 @@ fileokay(char *file, uchar_t *expbuf) } } - return(1); + return 1; } /*ARGSUSED*/ diff --git a/testcases/kernel/mem/mmapstress/mmapstress09.c b/testcases/kernel/mem/mmapstress/mmapstress09.c index b535889..36ef8a2 100644 --- a/testcases/kernel/mem/mmapstress/mmapstress09.c +++ b/testcases/kernel/mem/mmapstress/mmapstress09.c @@ -463,7 +463,7 @@ mapokay(uchar_t *expbuf) } } - return(1); + return 1; } /*ARGSUSED*/ diff --git a/testcases/kernel/mem/mmapstress/mmapstress10.c b/testcases/kernel/mem/mmapstress/mmapstress10.c index 1cd5639..de39c8a 100644 --- a/testcases/kernel/mem/mmapstress/mmapstress10.c +++ b/testcases/kernel/mem/mmapstress/mmapstress10.c @@ -846,7 +846,7 @@ fileokay(char *file, uchar_t *expbuf) } } - return(1); + return 1; } /*ARGSUSED*/ diff --git a/testcases/kernel/mem/page/page01.c b/testcases/kernel/mem/page/page01.c index 228d561..9f4a621 100644 --- a/testcases/kernel/mem/page/page01.c +++ b/testcases/kernel/mem/page/page01.c @@ -294,7 +294,7 @@ instress() { tst_resm(TINFO, "System resource may be too low, fork() malloc()" " etc are likely to fail.\n"); - return(1); + return 1; } diff --git a/testcases/kernel/sched/nptl/nptl01.c b/testcases/kernel/sched/nptl/nptl01.c index 0c4ddb2..675ed4a 100644 --- a/testcases/kernel/sched/nptl/nptl01.c +++ b/testcases/kernel/sched/nptl/nptl01.c @@ -276,7 +276,7 @@ int main(int argc, char** argv) tst_exit(); #endif /* NOT REACHED */ - return(1); + return 1; } /* diff --git a/testcases/kernel/sched/sched_stress/sched_tc6.c b/testcases/kernel/sched/sched_stress/sched_tc6.c index 6ef7c82..cbcb250 100644 --- a/testcases/kernel/sched/sched_stress/sched_tc6.c +++ b/testcases/kernel/sched/sched_stress/sched_tc6.c @@ -351,7 +351,7 @@ int read_file (int fd, char *filename) total_bytes = 0; } if (debug) printf ("\n"); - return(1); + return 1; } @@ -416,7 +416,7 @@ int unlock_file (int fd, char *file) if (fcntl (fd, F_SETLK, flock_ptr) < 0) sys_error ("fcntl failed", __FILE__, __LINE__); - return(1); + return 1; } diff --git a/testcases/kernel/syscalls/abort/abort01.c b/testcases/kernel/syscalls/abort/abort01.c index 28bcfd1..b13f242 100644 --- a/testcases/kernel/syscalls/abort/abort01.c +++ b/testcases/kernel/syscalls/abort/abort01.c @@ -191,7 +191,7 @@ void setup() int instress() { tst_resm(TINFO, "System resources may be too low; fork(), select() etc are likely to fail."); - return(1); + return 1; } void terror(char * message) diff --git a/testcases/kernel/syscalls/fcntl/fcntl07.c b/testcases/kernel/syscalls/fcntl/fcntl07.c index 1b070ce..17b13fe 100644 --- a/testcases/kernel/syscalls/fcntl/fcntl07.c +++ b/testcases/kernel/syscalls/fcntl/fcntl07.c @@ -394,7 +394,7 @@ do_exec(char *prog, int fd, char *tcd) if(WIFEXITED(stat_loc)) { return(WEXITSTATUS(stat_loc)); } else { - return(1); + return 1; } } } diff --git a/testcases/kernel/syscalls/fcntl/fcntl07B.c b/testcases/kernel/syscalls/fcntl/fcntl07B.c index ec79fe7..81e20f4 100644 --- a/testcases/kernel/syscalls/fcntl/fcntl07B.c +++ b/testcases/kernel/syscalls/fcntl/fcntl07B.c @@ -392,7 +392,7 @@ do_exec(char *prog, int fd, char *tcd) if(WIFEXITED(stat_loc)) { return(WEXITSTATUS(stat_loc)); } else { - return(1); + return 1; } } } diff --git a/testcases/kernel/syscalls/fcntl/fcntl15.c b/testcases/kernel/syscalls/fcntl/fcntl15.c index 42d1346..e640589 100644 --- a/testcases/kernel/syscalls/fcntl/fcntl15.c +++ b/testcases/kernel/syscalls/fcntl/fcntl15.c @@ -203,7 +203,7 @@ int dofork(int file_flag, int file_mode) /* create child process */ if ((child1 = FORK_OR_VFORK()) < 0) { perror("Fork failure"); - return(1); + return 1; } /* child1 */ @@ -212,7 +212,7 @@ int dofork(int file_flag, int file_mode) if (self_exec(argv0, "nddds", 1, file_flag, file_mode, parent, tmpname) < 0) { perror("self_exec failure"); - return(1); + return 1; } #else dochild1(file_flag, file_mode); @@ -409,7 +409,7 @@ run_test(int file_flag, int file_mode, int dup_flag) if ((fd_A = open(tmpname, file_flag, file_mode)) < 0) { perror("open first parent file failed"); tst_rmdir(); - return(1); + return 1; } /* write some data to the file */ @@ -422,7 +422,7 @@ run_test(int file_flag, int file_mode, int dup_flag) if ((fd_B = open(tmpname, file_flag, file_mode)) < 0) { perror("open second parent file failed"); tst_rmdir(); - return(1); + return 1; } } } else { @@ -430,7 +430,7 @@ run_test(int file_flag, int file_mode, int dup_flag) if ((fd_B = fcntl(fd_A, F_DUPFD, 0)) < 0) { perror("dup of second parent file failed"); tst_rmdir(); - return(1); + return 1; } } @@ -447,7 +447,7 @@ run_test(int file_flag, int file_mode, int dup_flag) if ((fcntl(fd_A, F_SETLK, &flock)) < 0) { perror("Attempt to set first parent lock failed"); tst_rmdir(); - return(1); + return 1; } if (dup_flag != FORK_) { @@ -461,7 +461,7 @@ run_test(int file_flag, int file_mode, int dup_flag) if ((fcntl(fd_B, F_SETLK, &flock)) < 0) { perror("Attempt to set second parent lock failed"); tst_rmdir(); - return(1); + return 1; } } @@ -469,7 +469,7 @@ run_test(int file_flag, int file_mode, int dup_flag) if ((child2 = FORK_OR_VFORK()) < 0) { perror("Fork failure"); tst_rmdir(); - return(1); + return 1; } else if (child2 == 0) { /* child */ dochild2(file_flag, file_mode, dup_flag); } @@ -516,14 +516,14 @@ run_test(int file_flag, int file_mode, int dup_flag) if ((kill(child2, SIGUSR2)) < 0) { perror("Signal to child2 failed"); tst_rmdir(); - return(1); + return 1; } if (dup_flag == FORK_) { if ((kill(child1, SIGUSR2)) < 0) { perror("Signal to child1 failed"); tst_rmdir(); - return(1); + return 1; } } /* wait for child to complete then cleanup */ @@ -531,7 +531,7 @@ run_test(int file_flag, int file_mode, int dup_flag) if (status >> 8 != 0) { tst_resm(TFAIL, "Expected 0 got %d", status >> 8); tst_rmdir(); - return(1); + return 1; } } if (dup_flag != FORK_) { diff --git a/testcases/kernel/syscalls/fcntl/fcntl16.c b/testcases/kernel/syscalls/fcntl/fcntl16.c index a0b0501..bee2eda 100644 --- a/testcases/kernel/syscalls/fcntl/fcntl16.c +++ b/testcases/kernel/syscalls/fcntl/fcntl16.c @@ -490,7 +490,7 @@ run_test(int file_flag, int file_mode, int start, int end) tst_resm(TFAIL, "Test case %d, errno = %d", test + 1, errno); unlink(tmpname); - return(1); + return 1; } /* Initialize second parent lock structure */ @@ -503,7 +503,7 @@ run_test(int file_flag, int file_mode, int start, int end) tst_resm(TFAIL, "Test case %d, errno = %d", test + 1, errno); unlink(tmpname); - return(1); + return 1; } } @@ -523,7 +523,7 @@ run_test(int file_flag, int file_mode, int start, int end) if (self_exec(argv0, "ddddd", i, parent, test, thislock, fd) < 0) { perror("self_exec failed"); - return(1); + return 1; } #else dochild(i); @@ -531,7 +531,7 @@ run_test(int file_flag, int file_mode, int start, int end) } if (child < 0) { perror("Fork failed"); - return(1); + return 1; } child_count++; child_pid[i] = child; @@ -573,7 +573,7 @@ run_test(int file_flag, int file_mode, int start, int end) tst_resm(TFAIL, "Test case %d, errno = %d", test + 1, errno); unlink(tmpname); - return(1); + return 1; } /* Initialize fourth parent lock structure */ @@ -586,7 +586,7 @@ run_test(int file_flag, int file_mode, int start, int end) tst_resm(TINFO, "Test case %d, errno = %d", test + 1, errno); unlink(tmpname); - return(1); + return 1; } } @@ -660,7 +660,7 @@ run_test(int file_flag, int file_mode, int start, int end) } unlink(tmpname); if (fail) { - return(1); + return 1; } else { return 0; } diff --git a/testcases/kernel/syscalls/fcntl/fcntl17.c b/testcases/kernel/syscalls/fcntl/fcntl17.c index 9db73a9..5e920c4 100644 --- a/testcases/kernel/syscalls/fcntl/fcntl17.c +++ b/testcases/kernel/syscalls/fcntl/fcntl17.c @@ -108,22 +108,22 @@ int setup() if(pipe(parent_pipe) < 0) { tst_resm(TFAIL, "Couldn't create parent_pipe! errno = %d", errno); - return(1); + return 1; } if(pipe(child_pipe1) < 0) { tst_resm(TFAIL, "Couldn't create child_pipe1! errno = %d", errno); - return(1); + return 1; } if(pipe(child_pipe2) < 0) { tst_resm(TFAIL, "Couldn't create child_pipe2! errno = %d", errno); - return(1); + return 1; } if(pipe(child_pipe3) < 0) { tst_resm(TFAIL, "Couldn't create child_pipe3! errno = %d", errno); - return(1); + return 1; } parent_pid = getpid(); snprintf(template, PATH_MAX, "fcntl17XXXXXX"); @@ -143,7 +143,7 @@ int setup() if (sigaction(SIGALRM, &act, NULL) < 0) { tst_resm(TFAIL, "SIGALRM signal setup failed, errno: %d", errno); - return(1); + return 1; } memset(&act, 0, sizeof(act)); @@ -153,7 +153,7 @@ int setup() if (sigaction(SIGCLD, &act, NULL) < 0) { tst_resm(TFAIL, "SIGCLD signal setup failed, errno: %d", errno); - return(1); + return 1; } return 0; } @@ -290,37 +290,37 @@ do_test(struct flock *lock, pid_t pid) if (fcntl(file_fd, F_GETLK, &fl) < 0) { tst_resm(TFAIL, "fcntl on file failed, errno =%d", errno); - return(1); + return 1; } if (fl.l_type != lock->l_type) { tst_resm(TFAIL, "lock type is wrong should be %s is %s", str_type(lock->l_type), str_type(fl.l_type)); - return(1); + return 1; } if (fl.l_whence != lock->l_whence) { tst_resm(TFAIL, "lock whence is wrong should be %d is %d", lock->l_whence, fl.l_whence); - return(1); + return 1; } if (fl.l_start != lock->l_start) { tst_resm(TFAIL, "region starts in wrong place, " "should be %d is %d", lock->l_start, fl.l_start); - return(1); + return 1; } if (fl.l_len != lock->l_len) { tst_resm(TFAIL, "region length is wrong, should be %d is %d", lock->l_len, fl.l_len); - return(1); + return 1; } if (fl.l_pid != pid) { tst_resm(TFAIL, "locking pid is wrong, should be %d is %d", pid, fl.l_pid); - return(1); + return 1; } return 0; } diff --git a/testcases/kernel/syscalls/symlink/symlink01.c b/testcases/kernel/syscalls/symlink/symlink01.c index b3801fa..ebd3be7 100644 --- a/testcases/kernel/syscalls/symlink/symlink01.c +++ b/testcases/kernel/syscalls/symlink/symlink01.c @@ -648,7 +648,7 @@ char *path; return(-1); if ((asymlink.st_mode & S_IFMT) == S_IFLNK) - return(1); + return 1; else return 0; } @@ -692,7 +692,7 @@ char *path1, *path2; tst_resm(TPASS, "symlink(%s, %s) was succesful.", path1, path2); #endif } - return(1); + return 1; } /*********************************************************************** @@ -728,7 +728,7 @@ char *path1; path1, errno, strerror(errno)); return 0; } - return(1); + return 1; } /*********************************************************************** @@ -748,7 +748,7 @@ char *path1, *path2, *path3; return 0; else if (creat_object(path3) == -1) return 0; - return(1); + return 1; } /*********************************************************************** @@ -780,7 +780,7 @@ char *path1, *path2, *path3; path2, path1, path3); return 0; } - return(1); + return 1; } /*********************************************************************** @@ -816,7 +816,7 @@ char *path1, *path2, *path3; path3, path2); return 0; } - return(1); + return 1; } @@ -859,7 +859,7 @@ char *path1, *path2, *path3; for (ctr=0; ctr < to_go; ctr++) strcat(full_path, "Z"); - return(1); + return 1; } /*********************************************************************** @@ -875,7 +875,7 @@ ck_path_max(path1, path2, path3) char *path1, *path2, *path3; { if (strlen(full_path) == (PATH_MAX+1)) - return(1); + return 1; else { TEST_RESULT=TBROK; @@ -927,7 +927,7 @@ char *path1, *path2, *path3; return 0; } - return(1); + return 1; } /*********************************************************************** -- 1.5.5.1 ------------------------------------------------------------------------------ Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise -Strategies to boost innovation and cut costs with open source participation -Receive a $600 discount off the registration fee with the source code: SFAD http://p.sf.net/sfu/XcvMzF8H _______________________________________________ Ltp-list mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ltp-list
