diff options
Diffstat (limited to 'usr/src/lib')
| -rw-r--r-- | usr/src/lib/libctf/common/ctf_dwarf.c | 7 | ||||
| -rw-r--r-- | usr/src/lib/libzdoor/common/zdoor.c | 20 |
2 files changed, 9 insertions, 18 deletions
diff --git a/usr/src/lib/libctf/common/ctf_dwarf.c b/usr/src/lib/libctf/common/ctf_dwarf.c index 811a55bc64..13a049d243 100644 --- a/usr/src/lib/libctf/common/ctf_dwarf.c +++ b/usr/src/lib/libctf/common/ctf_dwarf.c @@ -28,7 +28,7 @@ */ /* - * Copyright 2015 Joyent, Inc. + * Copyright 2018 Joyent, Inc. */ /* @@ -225,7 +225,7 @@ typedef struct ctf_dwmap { typedef struct ctf_dwvar { ctf_list_t cdv_list; - char *cdv_name; + char *cdv_name; ctf_id_t cdv_type; boolean_t cdv_global; } ctf_dwvar_t; @@ -1445,7 +1445,6 @@ ctf_dwarf_create_array(ctf_die_t *cdp, Dwarf_Die die, ctf_id_t *idp, int isroot) Dwarf_Die tdie, rdie; ctf_id_t tid; Dwarf_Half rtag; - ctf_arinfo_t ar; if ((ret = ctf_dwarf_refdie(cdp, die, DW_AT_type, &tdie)) != 0) return (ret); @@ -1453,8 +1452,6 @@ ctf_dwarf_create_array(ctf_die_t *cdp, Dwarf_Die die, ctf_id_t *idp, int isroot) CTF_ADD_NONROOT)) != 0) return (ret); - ar.ctr_contents = tid; - if ((ret = ctf_dwarf_child(cdp, die, &rdie)) != 0) return (ret); if ((ret = ctf_dwarf_tag(cdp, rdie, &rtag)) != 0) diff --git a/usr/src/lib/libzdoor/common/zdoor.c b/usr/src/lib/libzdoor/common/zdoor.c index f2996b4e2d..d04e7ccb0f 100644 --- a/usr/src/lib/libzdoor/common/zdoor.c +++ b/usr/src/lib/libzdoor/common/zdoor.c @@ -19,12 +19,9 @@ * CDDL HEADER END */ /* - * Copyright 2011 Joyent, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright 2018 Joyent, Inc. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <alloca.h> #include <door.h> #include <errno.h> @@ -47,8 +44,8 @@ extern void * zonecfg_notify_bind(int(*func)(const char *zonename, zoneid_t zid, - const char *newstate, const char *oldstate, - hrtime_t when, void *p), void *p); + const char *newstate, const char *oldstate, hrtime_t when, + void *p), void *p); extern void zonecfg_notify_unbind(void *handle); @@ -69,7 +66,7 @@ zonecfg_notify_unbind(void *handle); */ static void _callback(void *cookie, char *argp, size_t arg_size, door_desc_t *dp, - uint_t n_desc) + uint_t n_desc) { zdoor_result_t *result = NULL; void *door_response = NULL; @@ -97,7 +94,7 @@ _callback(void *cookie, char *argp, size_t arg_size, door_desc_t *dp, if (door_response != NULL) { size = result->zdr_size; (void) memcpy(door_response, - (void *) result->zdr_data, size); + (void *) result->zdr_data, size); } } @@ -145,7 +142,6 @@ zdoor_create(dtree_entry_t *entry) { int status = ZDOOR_OK; zoneid_t zid = -1; - zdoor_handle_t handle = NULL; if (entry == NULL) { zdoor_debug("zdoor_create: NULL arguments"); @@ -155,8 +151,6 @@ zdoor_create(dtree_entry_t *entry) zdoor_debug("zdoor_create: entry=%p, zone=%s, service=%s", entry, entry->dte_parent->zte_zonename, entry->dte_service); - handle = entry->dte_parent->zte_parent; - zid = getzoneidbyname(entry->dte_parent->zte_zonename); if (zid < 0) { zdoor_info("zdoor_create: %s is a non-existient zone", @@ -225,7 +219,7 @@ zdoor_visitor(dtree_entry_t *entry) */ static int zone_monitor(const char *zonename, zoneid_t zid, const char *newstate, - const char *oldstate, hrtime_t when, void *p) + const char *oldstate, hrtime_t when, void *p) { zdoor_handle_t handle = (zdoor_handle_t)p; ztree_entry_t *entry = NULL; @@ -310,7 +304,7 @@ zdoor_handle_destroy(zdoor_handle_t handle) */ int zdoor_open(zdoor_handle_t handle, const char *zonename, const char *service, - void *biscuit, zdoor_callback callback) + void *biscuit, zdoor_callback callback) { zdoor_cookie_t *zdoor_cookie = NULL; int rc = -1; |