diff options
| author |   tobias <tobias@openbsd.org> | 2008-02-20 17:29:28 +0000 |
|---|---|---|
| committer | tobias <tobias@openbsd.org> | 2008-02-20 17:29:28 +0000 |
| commit | 0a178a7de65fde52daace5083b51a105607a2029 (patch) | |
| tree | 0bd3df94cd03525280ddefcf2c57e754af69ca8b /usr.bin/cvs/import.c | |
| parent | correct boolean encoding for coredump; der Mouse via dugsong (diff) | |
| download | wireguard-openbsd-0a178a7de65fde52daace5083b51a105607a2029.tar.xz wireguard-openbsd-0a178a7de65fde52daace5083b51a105607a2029.zip | |
With latest buf cleanup, rcs_rev_getbuf won't return NULL anymore.
OK joris@
Diffstat (limited to 'usr.bin/cvs/import.c')
| -rw-r--r-- | usr.bin/cvs/import.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/usr.bin/cvs/import.c b/usr.bin/cvs/import.c index 93059218fd4..83047694576 100644 --- a/usr.bin/cvs/import.c +++ b/usr.bin/cvs/import.c @@ -1,4 +1,4 @@ -/* $OpenBSD: import.c,v 1.83 2008/02/11 20:33:11 tobias Exp $ */ +/* $OpenBSD: import.c,v 1.84 2008/02/20 17:29:28 tobias Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -292,14 +292,13 @@ import_update(struct cvs_file *cf) cvs_log(LP_TRACE, "import_update(%s)", cf->file_path); if ((rev = rcs_translate_tag(import_branch, cf->file_rcs)) == NULL) - fatal("import_update: could not translate tag `%s'", import_branch); + fatal("import_update: could not translate tag `%s'", + import_branch); if ((brev = rcsnum_parse(import_branch)) == NULL) fatal("import_update: rcsnum_parse failed"); - if ((b1 = rcs_rev_getbuf(cf->file_rcs, rev, RCS_KWEXP_NONE)) == NULL) - fatal("import_update: failed to grab revision"); - + b1 = rcs_rev_getbuf(cf->file_rcs, rev, RCS_KWEXP_NONE); b2 = cvs_buf_load_fd(cf->fd); ret = cvs_buf_differ(b1, b2); |