From 0a178a7de65fde52daace5083b51a105607a2029 Mon Sep 17 00:00:00 2001 From: tobias Date: Wed, 20 Feb 2008 17:29:28 +0000 Subject: With latest buf cleanup, rcs_rev_getbuf won't return NULL anymore. OK joris@ --- usr.bin/cvs/import.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'usr.bin/cvs/import.c') 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 * @@ -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); -- cgit v1.2.3-59-g8ed1b