diff options
| author | vikram <none@none> | 2007-01-29 13:33:08 -0800 |
|---|---|---|
| committer | vikram <none@none> | 2007-01-29 13:33:08 -0800 |
| commit | 691b55abbc2aa71b47338f7971838df72745f2da (patch) | |
| tree | 0a5c4f43809587cd8440464210a7851a6b1a46dd | |
| parent | e436c1686d32fd6b0d86ae8d3a1ec8ecb5aece29 (diff) | |
| download | illumos-joyent-691b55abbc2aa71b47338f7971838df72745f2da.tar.gz | |
6517377 path_get_descriptor_by_name() always returns NULL
6517388 rcm_daemon_call() may test uninitialized variable
| -rw-r--r-- | usr/src/lib/libdiskmgt/common/path.c | 9 | ||||
| -rw-r--r-- | usr/src/lib/librcm/librcm.c | 9 |
2 files changed, 8 insertions, 10 deletions
diff --git a/usr/src/lib/libdiskmgt/common/path.c b/usr/src/lib/libdiskmgt/common/path.c index b5080dc93b..d9b2fafaa0 100644 --- a/usr/src/lib/libdiskmgt/common/path.c +++ b/usr/src/lib/libdiskmgt/common/path.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -122,7 +121,7 @@ path_get_descriptor_by_name(char *name, int *errp) *errp = ENODEV; } - return (NULL); + return (path); } /* ARGSUSED */ diff --git a/usr/src/lib/librcm/librcm.c b/usr/src/lib/librcm/librcm.c index 381cfa8a65..88ca8b29c6 100644 --- a/usr/src/lib/librcm/librcm.c +++ b/usr/src/lib/librcm/librcm.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -1125,7 +1124,7 @@ rcm_daemon_call(int cmd, rcm_handle_t *hd, char **rsrcnames, uint_t flag, void *arg, rcm_info_t **infop) { int errno_found; - int daemon_errno; + int daemon_errno = 0; int error = RCM_SUCCESS; int delay = 300; int maxdelay = 10000; /* 10 seconds */ |