svn commit: r298490 - stable/10/tests/sys/file

[Garrett Cooper]

Author: ngie
Date: Fri Apr 22 21:30:42 2016
New Revision: 298490
URL: https://svnweb.freebsd.org/changeset/base/298490

Log:
  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

Modified:
  stable/10/tests/sys/file/flock_helper.c
  stable/10/tests/sys/file/newfileops_on_fork_test.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/tests/sys/file/flock_helper.c
==============================================================================
--- stable/10/tests/sys/file/flock_helper.c	Fri Apr 22 21:28:50 2016	(r298489)
+++ stable/10/tests/sys/file/flock_helper.c	Fri Apr 22 21:30:42 2016	(r298490)
@@ -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;

Modified: stable/10/tests/sys/file/newfileops_on_fork_test.c
==============================================================================
--- stable/10/tests/sys/file/newfileops_on_fork_test.c	Fri Apr 22 21:28:50 2016	(r298489)
+++ stable/10/tests/sys/file/newfileops_on_fork_test.c	Fri Apr 22 21:30:42 2016	(r298490)
@@ -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 *a
 		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);
 }