Module Name: src
Committed By: riz
Date: Sun Aug 14 23:44:48 UTC 2011
Modified Files:
src/sbin/drvctl [netbsd-5]: drvctl.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #1659):
sbin/drvctl/drvctl.c: patch
Fix the build problem introduced by pullup ticket #1656.
To generate a diff of this commit:
cvs rdiff -u -r1.6.10.3 -r1.6.10.4 src/sbin/drvctl/drvctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/drvctl/drvctl.c
diff -u src/sbin/drvctl/drvctl.c:1.6.10.3 src/sbin/drvctl/drvctl.c:1.6.10.4
--- src/sbin/drvctl/drvctl.c:1.6.10.3 Fri Aug 12 20:55:55 2011
+++ src/sbin/drvctl/drvctl.c Sun Aug 14 23:44:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: drvctl.c,v 1.6.10.3 2011/08/12 20:55:55 riz Exp $ */
+/* $NetBSD: drvctl.c,v 1.6.10.4 2011/08/14 23:44:48 riz Exp $ */
/*
* Copyright (c) 2004
@@ -228,13 +228,14 @@
while (p) {
cur = p;
p = strtok_r(NULL, "/", &ep);
+ obj = prop_dictionary_get(dict, cur);
+ if (obj == NULL)
+ exit(EXIT_FAILURE);
if (p) {
- if (prop_dictionary_get_dict(dict, cur, &dict) == false)
+ if (prop_object_type(obj) != PROP_TYPE_DICTIONARY)
exit(EXIT_FAILURE);
+ dict = obj;
} else {
- obj = prop_dictionary_get(dict, cur);
- if (obj == NULL)
- exit(EXIT_FAILURE);
switch (prop_object_type(obj)) {
case PROP_TYPE_BOOL:
printf("%s\n",
