From bde8eddcc0589e545fc05743eefba011bb1b4a56 Mon Sep 17 00:00:00 2001 From: ngie Date: Fri, 22 Apr 2016 21:30:42 +0000 Subject: [PATCH] MFC r298024,r298196: r298024: Set test_argv to NULL, not 0, if not executing a specific test r298196: Minor cosmetic cleanup - Remove spurious trailing whitespace in licensing header - Remove unnecessary semi-colon after comment git-svn-id: svn://svn.freebsd.org/base/stable/10@298490 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- tests/sys/file/flock_helper.c | 2 +- tests/sys/file/newfileops_on_fork_test.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/sys/file/flock_helper.c b/tests/sys/file/flock_helper.c index 49e47b830..0fca15e48 100644 --- a/tests/sys/file/flock_helper.c +++ b/tests/sys/file/flock_helper.c @@ -1566,7 +1566,7 @@ main(int argc, const char *argv[]) } else { testnum = 0; test_argc = 0; - test_argv = 0; + test_argv = NULL; } sa.sa_handler = ignore_alarm; diff --git a/tests/sys/file/newfileops_on_fork_test.c b/tests/sys/file/newfileops_on_fork_test.c index 8713a8264..85eea9dac 100644 --- a/tests/sys/file/newfileops_on_fork_test.c +++ b/tests/sys/file/newfileops_on_fork_test.c @@ -3,7 +3,7 @@ * All rights reserved. * * This software was developed at the University of Cambridge Computer - * Laboratory with support from a grant from Google, Inc. + * Laboratory with support from a grant from Google, Inc. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -115,7 +115,7 @@ main(__unused int argc, __unused char *argv[]) err(-1, "listen"); if (pthread_create(&accept_thread, NULL, do_accept, NULL) != 0) err(-1, "pthread_create"); - sleep(1); /* Easier than using a CV. */; + sleep(1); /* Easier than using a CV. */ do_fork(); exit(0); } -- 2.45.0