Module Name: src
Committed By: christos
Date: Mon Aug 18 09:16:35 UTC 2014
Modified Files:
src/usr.bin/flock: flock.c
Log Message:
remove XXX, fix error message
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/flock/flock.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/flock/flock.c
diff -u src/usr.bin/flock/flock.c:1.10 src/usr.bin/flock/flock.c:1.11
--- src/usr.bin/flock/flock.c:1.10 Mon Aug 18 05:14:03 2014
+++ src/usr.bin/flock/flock.c Mon Aug 18 05:16:35 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: flock.c,v 1.10 2014/08/18 09:14:03 christos Exp $ */
+/* $NetBSD: flock.c,v 1.11 2014/08/18 09:16:35 christos Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: flock.c,v 1.10 2014/08/18 09:14:03 christos Exp $");
+__RCSID("$NetBSD: flock.c,v 1.11 2014/08/18 09:16:35 christos Exp $");
#include <stdio.h>
#include <string.h>
@@ -216,9 +216,9 @@ main(int argc, char *argv[])
usage("Missing lock file argument");
case 1:
if (cls)
- usage("Close is valid only for descriptors");
+ usage("Close is not valid for descriptors");
errno = 0;
- l = strtol(argv[0], &v, 0); // XXX: error checking
+ l = strtol(argv[0], &v, 0);
if ((l == LONG_MIN || l == LONG_MAX) && errno == ERANGE)
err(EXIT_FAILURE, "Bad file descriptor `%s'", argv[0]);
if (l > INT_MAX || l < 0 || *v)