diff options
| author |   ragge <ragge@openbsd.org> | 2008-06-23 20:51:08 +0000 |
|---|---|---|
| committer | ragge <ragge@openbsd.org> | 2008-06-23 20:51:08 +0000 |
| commit | 7eeb490876e8927e6c89284a32c3cfb72f3ae1fc (patch) | |
| tree | b9d920eb69a3d515e420fdd39ec7a2cf72d8471c /usr.bin/cvs/edit.c | |
| parent | Do not compile the ``kbd needs to be rebuilt'' test if -DNOKVM. Should shave (diff) | |
| download | wireguard-openbsd-7eeb490876e8927e6c89284a32c3cfb72f3ae1fc.tar.xz wireguard-openbsd-7eeb490876e8927e6c89284a32c3cfb72f3ae1fc.zip | |
Some conformance fixes:
- Empty brackets forbidden in C99.
- ? : and skipping middle argument is both disallowed and considered bad
programming habit.
OK ray@, xsa@.
Diffstat (limited to 'usr.bin/cvs/edit.c')
| -rw-r--r-- | usr.bin/cvs/edit.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/cvs/edit.c b/usr.bin/cvs/edit.c index ef22aa61385..c4e6802bd07 100644 --- a/usr.bin/cvs/edit.c +++ b/usr.bin/cvs/edit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: edit.c,v 1.47 2008/06/14 03:19:15 joris Exp $ */ +/* $OpenBSD: edit.c,v 1.48 2008/06/23 20:51:08 ragge Exp $ */ /* * Copyright (c) 2006, 2007 Xavier Santolaria <xsa@openbsd.org> * @@ -44,7 +44,7 @@ static int edit_aflags = 0; struct cvs_cmd cvs_cmd_edit = { CVS_OP_EDIT, CVS_USE_WDIR, "edit", - { }, + { { 0 }, { 0 } }, "Get ready to edit a watched file", "[-lR] [-a action] [file ...]", "a:lR", @@ -54,7 +54,7 @@ struct cvs_cmd cvs_cmd_edit = { struct cvs_cmd cvs_cmd_editors = { CVS_OP_EDITORS, CVS_USE_WDIR, "editors", - { }, + { { 0 }, { 0 } }, "See who is editing a watched file", "[-lR] [file ...]", "lR", @@ -64,7 +64,7 @@ struct cvs_cmd cvs_cmd_editors = { struct cvs_cmd cvs_cmd_unedit = { CVS_OP_UNEDIT, CVS_USE_WDIR, "unedit", - { }, + { { 0 }, { 0 } }, "Undo an edit command", "[-lR] [file ...]", "lR", @@ -402,8 +402,8 @@ cvs_unedit_local(struct cvs_file *cf) cf->file_ent->ce_tag); (void)xasprintf(&entry, "/%s/%s/%s/%s/%s", - cf->file_name, rbuf, timebuf, cf->file_ent->ce_opts ? : "", - sticky); + cf->file_name, rbuf, timebuf, cf->file_ent->ce_opts ? + cf->file_ent->ce_opts : "", sticky); cvs_ent_add(entlist, entry); |