kill const and string artithmetic related warnings; ok millert@

4 files changed, 17 insertions, 14 deletions

diff --git a/usr.bin/rcs/co.c b/usr.bin/rcs/co.c
index 9521a6d0bc5..3bfb49d5af0 100644
--- a/usr.bin/rcs/co.c
+++ b/usr.bin/rcs/co.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: co.c,v 1.122 2015/10/21 16:06:57 millert Exp $	*/
+/*	$OpenBSD: co.c,v 1.123 2017/08/29 16:47:33 otto Exp $	*/
 /*
  * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
  * All rights reserved.
@@ -511,14 +511,17 @@ checkout_err_nobranch(RCSFILE *file, const char *author, const char *date,
 	if (!(flags & CO_STATE))
 		state = NULL;
 
-	warnx("%s: No revision on branch has%s%s%s%s%s%s.",
+	warnx("%s: No revision on branch has %s%s%s%s%s%s%s%s.",
 	    file->rf_path,
-	    date ? " a date before " : "",
+	    date ? "a date before " : "",
 	    date ? date : "",
-	    author ? " and author " + (date ? 0:4) : "",
+	    (date && author) ? " and " : "",
+	    author ? "author " : "",
 	    author ? author : "",
-	    state  ? " and state " + (date || author ? 0:4) : "",
-	    state  ? state : "");
+	    ((date || author) && state) ? " and " : "",
+	    state ? "state " : "",
+	    state ? state : "");
+
 }
 
 /*
diff --git a/usr.bin/rcs/rcs.h b/usr.bin/rcs/rcs.h
index ff6a3ae27e9..ec672a1306f 100644
--- a/usr.bin/rcs/rcs.h
+++ b/usr.bin/rcs/rcs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcs.h,v 1.17 2016/05/09 13:03:55 schwarze Exp $	*/
+/*	$OpenBSD: rcs.h,v 1.18 2017/08/29 16:47:33 otto Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -261,7 +261,7 @@ RCSNUM	*rcsnum_revtobr(const RCSNUM *);
 RCSNUM	*rcsnum_inc(RCSNUM *);
 void	 rcsnum_free(RCSNUM *);
 int	 rcsnum_addmagic(RCSNUM *);
-int	 rcsnum_aton(const char *, char **, RCSNUM *);
+int	 rcsnum_aton(const char *, const char **, RCSNUM *);
 char	*rcsnum_tostr(const RCSNUM *, char *, size_t);
 void	 rcsnum_cpy(const RCSNUM *, RCSNUM *, u_int);
 int	 rcsnum_cmp(const RCSNUM *, const RCSNUM *, u_int);
diff --git a/usr.bin/rcs/rcsnum.c b/usr.bin/rcs/rcsnum.c
index 1db78992007..8f4b11641e2 100644
--- a/usr.bin/rcs/rcsnum.c
+++ b/usr.bin/rcs/rcsnum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcsnum.c,v 1.19 2016/08/26 09:02:54 guenther Exp $	*/
+/*	$OpenBSD: rcsnum.c,v 1.20 2017/08/29 16:47:33 otto Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -84,7 +84,7 @@ rcsnum_addmagic(RCSNUM *rn)
 RCSNUM *
 rcsnum_parse(const char *str)
 {
-	char *ep;
+	const char *ep;
 	RCSNUM *num;
 
 	num = rcsnum_alloc();
@@ -238,7 +238,7 @@ rcsnum_cmp(const RCSNUM *n1, const RCSNUM *n2, u_int depth)
  * Returns 0 on success, or -1 on failure.
  */
 int
-rcsnum_aton(const char *str, char **ep, RCSNUM *nump)
+rcsnum_aton(const char *str, const char **ep, RCSNUM *nump)
 {
 	u_int32_t val;
 	const char *sp;
@@ -275,7 +275,7 @@ rcsnum_aton(const char *str, char **ep, RCSNUM *nump)
 	}
 
 	if (ep != NULL)
-		*(const char **)ep = sp;
+		*ep = sp;
 
 	/*
 	 * Handle "magic" RCS branch numbers.
diff --git a/usr.bin/rcs/rcsutil.c b/usr.bin/rcs/rcsutil.c
index ff100a600c4..af002852ce9 100644
--- a/usr.bin/rcs/rcsutil.c
+++ b/usr.bin/rcs/rcsutil.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcsutil.c,v 1.45 2016/07/04 01:39:12 millert Exp $	*/
+/*	$OpenBSD: rcsutil.c,v 1.46 2017/08/29 16:47:33 otto Exp $	*/
 /*
  * Copyright (c) 2005, 2006 Joris Vink <joris@openbsd.org>
  * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org>
@@ -365,7 +365,7 @@ rcs_rev_select(RCSFILE *file, const char *range)
 {
 	int i;
 	u_int nrev;
-	char *ep;
+	const char *ep;
 	char *lstr, *rstr;
 	struct rcs_delta *rdp;
 	struct rcs_argvector *revargv, *revrange;