Module Name: src
Committed By: dholland
Date: Mon May 30 02:33:49 UTC 2016
Modified Files:
src/sys/dev: firmload.c
Log Message:
PR 51184 David Binderman: simplify redundant conditional
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/firmload.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/firmload.c
diff -u src/sys/dev/firmload.c:1.21 src/sys/dev/firmload.c:1.22
--- src/sys/dev/firmload.c:1.21 Sun Jan 4 19:25:32 2015
+++ src/sys/dev/firmload.c Mon May 30 02:33:49 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: firmload.c,v 1.21 2015/01/04 19:25:32 pooka Exp $ */
+/* $NetBSD: firmload.c,v 1.22 2016/05/30 02:33:49 dholland Exp $ */
/*-
* Copyright (c) 2005, 2006 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: firmload.c,v 1.21 2015/01/04 19:25:32 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: firmload.c,v 1.22 2016/05/30 02:33:49 dholland Exp $");
/*
* The firmload API provides an interface for device drivers to access
@@ -142,8 +142,7 @@ firmware_path_next(const char *drvname,
size_t maxprefix, i;
if (prefix == NULL /* terminated early */
- || *prefix == '\0' /* no more left */
- || *prefix != '/') { /* not absolute */
+ || *prefix != '/') { /* empty or not absolute */
*prefixp = NULL;
return (NULL);
}
