Mercurial > unleashed

changeset 20635:85678228caec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fmd: fix 64-bit compilation
author Lauri Tirkkonen <lotheac@iki.fi>
date Tue, 11 Jun 2019 17:16:11 +0300
parents ca403d342ae5
children 48348368a5f6
files usr/src/cmd/fm/fmd/common/fmd_api.c usr/src/cmd/fm/fmd/common/fmd_event.c usr/src/cmd/fm/fmd/common/fmd_mdb.c usr/src/cmd/fm/fmd/common/fmd_rpc_adm.c
diffstat 4 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/cmd/fm/fmd/common/fmd_api.c	Tue Jun 11 17:01:44 2019 +0300
+++ b/usr/src/cmd/fm/fmd/common/fmd_api.c	Tue Jun 11 17:16:11 2019 +0300
@@ -1949,7 +1949,7 @@
 		fmd_free(t, sizeof (fmd_modtimer_t));
 	fmd_module_unlock(mp);
 
-	fmd_eventq_cancel(mp->mod_queue, FMD_EVT_TIMEOUT, (void *)id);
+	fmd_eventq_cancel(mp->mod_queue, FMD_EVT_TIMEOUT, (void *)(intptr_t)id);
 }
 
 static nvlist_t *
--- a/usr/src/cmd/fm/fmd/common/fmd_event.c	Tue Jun 11 17:01:44 2019 +0300
+++ b/usr/src/cmd/fm/fmd/common/fmd_event.c	Tue Jun 11 17:16:11 2019 +0300
@@ -348,7 +348,7 @@
 	if (type == FMD_EVT_PROTOCOL)
 		return (fmd_strmatch(ep->ev_data, data));
 	else if (type == FMD_EVT_TIMEOUT)
-		return ((id_t)data == ((fmd_modtimer_t *)ep->ev_data)->mt_id);
+		return ((id_t)(intptr_t)data == ((fmd_modtimer_t *)ep->ev_data)->mt_id);
 	else
 		return (ep->ev_data == data);
 }
--- a/usr/src/cmd/fm/fmd/common/fmd_mdb.c	Tue Jun 11 17:01:44 2019 +0300
+++ b/usr/src/cmd/fm/fmd/common/fmd_mdb.c	Tue Jun 11 17:16:11 2019 +0300
@@ -1271,7 +1271,7 @@
 static int
 fcf_sec_walk_step(mdb_walk_state_t *wsp)
 {
-	uint_t i = (uint_t)wsp->walk_arg;
+	uintptr_t i = (uintptr_t)wsp->walk_arg;
 	size_t off = sizeof (fcf_hdr_t) + sizeof (fcf_sec_t) * i;
 	fcf_hdr_t *hp = wsp->walk_data;
 	fcf_sec_t *sp = (fcf_sec_t *)((uintptr_t)hp + off);
--- a/usr/src/cmd/fm/fmd/common/fmd_rpc_adm.c	Tue Jun 11 17:01:44 2019 +0300
+++ b/usr/src/cmd/fm/fmd/common/fmd_rpc_adm.c	Tue Jun 11 17:16:11 2019 +0300
@@ -909,6 +909,7 @@
 	fmd_case_t *cp;
 	nvlist_t *nvl;
 	int err = 0;
+	size_t len;
 
 	bzero(rvp, sizeof (struct fmd_rpc_caseinfo));
 
@@ -930,8 +931,10 @@
 
 	nvl = fmd_case_mkevent(cp, FM_LIST_SUSPECT_CLASS);
 
+	len = rvp->rci_evbuf.rci_evbuf_len;
 	err = nvlist_pack(nvl, &rvp->rci_evbuf.rci_evbuf_val,
-	    &rvp->rci_evbuf.rci_evbuf_len, NV_ENCODE_XDR, 0);
+	    &len, NV_ENCODE_XDR, 0);
+	rvp->rci_evbuf.rci_evbuf_len = len;
 
 	nvlist_free(nvl);