From dc548fa222164f320e06084fcca5a74744c824dd Mon Sep 17 00:00:00 2001 From: millert Date: Wed, 21 Oct 2015 16:06:57 +0000 Subject: [PATCH] Style fixes; from Ilya Kaliman --- bin/ed/main.c | 4 ++-- usr.bin/rcs/co.c | 4 ++-- usr.bin/who/who.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/ed/main.c b/bin/ed/main.c index 2489a63e1c9..b98dcef6812 100644 --- a/bin/ed/main.c +++ b/bin/ed/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.53 2015/10/09 21:24:05 tobias Exp $ */ +/* $OpenBSD: main.c,v 1.54 2015/10/21 16:06:57 millert Exp $ */ /* $NetBSD: main.c,v 1.3 1995/03/21 09:04:44 cgd Exp $ */ /* main.c: This file contains the main control and user-interface routines @@ -174,7 +174,7 @@ top: signal(SIGHUP, signal_hup); signal(SIGQUIT, SIG_IGN); signal(SIGINT, signal_int); - if (status = sigsetjmp(env, 1)) { + if ((status = sigsetjmp(env, 1))) { fputs("\n?\n", stderr); seterrmsg("interrupt"); } else { diff --git a/usr.bin/rcs/co.c b/usr.bin/rcs/co.c index fb987eba115..9521a6d0bc5 100644 --- a/usr.bin/rcs/co.c +++ b/usr.bin/rcs/co.c @@ -1,4 +1,4 @@ -/* $OpenBSD: co.c,v 1.121 2015/06/13 20:15:21 nicm Exp $ */ +/* $OpenBSD: co.c,v 1.122 2015/10/21 16:06:57 millert Exp $ */ /* * Copyright (c) 2005 Joris Vink * All rights reserved. @@ -515,7 +515,7 @@ checkout_err_nobranch(RCSFILE *file, const char *author, const char *date, file->rf_path, date ? " a date before " : "", date ? date : "", - author ? " and author " + (date ? 0:4 ) : "", + author ? " and author " + (date ? 0:4) : "", author ? author : "", state ? " and state " + (date || author ? 0:4) : "", state ? state : ""); diff --git a/usr.bin/who/who.c b/usr.bin/who/who.c index 2956f398654..7eca651ec02 100644 --- a/usr.bin/who/who.c +++ b/usr.bin/who/who.c @@ -1,4 +1,4 @@ -/* $OpenBSD: who.c,v 1.26 2015/10/12 19:56:47 naddy Exp $ */ +/* $OpenBSD: who.c,v 1.27 2015/10/21 16:06:57 millert Exp $ */ /* $NetBSD: who.c,v 1.4 1994/12/07 04:28:49 jtc Exp $ */ /* @@ -77,7 +77,7 @@ main(int argc, char *argv[]) if (pledge("stdio rpath getpw", NULL) == -1) err(1, "pledge"); - if (mytty = ttyname(0)) { + if ((mytty = ttyname(0))) { /* strip any directory component */ if ((t = strrchr(mytty, '/'))) mytty = t + 1; -- 2.20.1