summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorray <ray@openbsd.org>2006-07-08 09:14:03 +0000
committerray <ray@openbsd.org>2006-07-08 09:14:03 +0000
commitec410bc4fd34fda8fcd21d9e05b5a1691b8a2ab3 (patch)
tree7333be31018dd94ee9422f332b36e199c44af900
parentjmc and I both pronounce ldconfig as ell-dee-config, so it should be (diff)
downloadwireguard-openbsd-ec410bc4fd34fda8fcd21d9e05b5a1691b8a2ab3.tar.xz
wireguard-openbsd-ec410bc4fd34fda8fcd21d9e05b5a1691b8a2ab3.zip
rcs_splitlines() can never return NULL, so don't check for it.
OK joris@
-rw-r--r--usr.bin/rcs/rcsutil.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/usr.bin/rcs/rcsutil.c b/usr.bin/rcs/rcsutil.c
index 89c805cd2d7..3a7b3da11f8 100644
--- a/usr.bin/rcs/rcsutil.c
+++ b/usr.bin/rcs/rcsutil.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rcsutil.c,v 1.16 2006/07/04 22:14:56 niallo Exp $ */
+/* $OpenBSD: rcsutil.c,v 1.17 2006/07/08 09:14:03 ray Exp $ */
/*
* Copyright (c) 2005, 2006 Joris Vink <joris@openbsd.org>
* Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org>
@@ -533,11 +533,8 @@ rcs_patchfile(BUF *data, BUF *patch,
len = rcs_buf_len(data);
- if ((dlines = rcs_splitlines(data)) == NULL)
- return (NULL);
-
- if ((plines = rcs_splitlines(patch)) == NULL)
- return (NULL);
+ dlines = rcs_splitlines(data);
+ plines = rcs_splitlines(patch);
if (p(dlines, plines) < 0) {
rcs_freelines(dlines);