diff options
Diffstat (limited to 'usr/src/cmd/hal/addons')
| -rw-r--r-- | usr/src/cmd/hal/addons/network-devices/common.c | 5 | ||||
| -rw-r--r-- | usr/src/cmd/hal/addons/storage/addon-storage.c | 9 |
2 files changed, 4 insertions, 10 deletions
diff --git a/usr/src/cmd/hal/addons/network-devices/common.c b/usr/src/cmd/hal/addons/network-devices/common.c index 258165e810..785464f592 100644 --- a/usr/src/cmd/hal/addons/network-devices/common.c +++ b/usr/src/cmd/hal/addons/network-devices/common.c @@ -1,4 +1,5 @@ /* + * Copyright 2017 Gary Mills * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. * * Licensed under the Academic Free License version 2.1 @@ -113,7 +114,7 @@ addr_to_string(char *prefix, uchar_t *mac, int mac_len, char *buf, int buf_len) static char * pseudo_serialno_from_addr(char *name) { - int sd, rc, errnum; + int sd, errnum; char buf[128]; struct hostent *hp; struct xarpreq ar; @@ -140,7 +141,7 @@ pseudo_serialno_from_addr(char *name) sd = socket(AF_INET, SOCK_DGRAM, 0); ar.xarp_ha.sdl_family = AF_LINK; - rc = ioctl(sd, SIOCGXARP, (caddr_t)&ar); + (void) ioctl(sd, SIOCGXARP, (caddr_t)&ar); close(sd); diff --git a/usr/src/cmd/hal/addons/storage/addon-storage.c b/usr/src/cmd/hal/addons/storage/addon-storage.c index c8eeae61cc..087b7c2097 100644 --- a/usr/src/cmd/hal/addons/storage/addon-storage.c +++ b/usr/src/cmd/hal/addons/storage/addon-storage.c @@ -2,6 +2,7 @@ * * addon-storage.c : watch removable media state changes * + * Copyright 2017 Gary Mills * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. * @@ -318,8 +319,6 @@ main (int argc, char *argv[]) char *bus; char *drive_type; int state, last_state; - char *support_media_changed_str; - int support_media_changed; int fd = -1; if ((udi = getenv ("UDI")) == NULL) @@ -341,12 +340,6 @@ main (int argc, char *argv[]) sysevent_init (); - support_media_changed_str = getenv ("HAL_PROP_STORAGE_CDROM_SUPPORT_MEDIA_CHANGED"); - if (support_media_changed_str != NULL && strcmp (support_media_changed_str, "true") == 0) - support_media_changed = TRUE; - else - support_media_changed = FALSE; - dbus_error_init (&error); if ((ctx = libhal_ctx_init_direct (&error)) == NULL) { |