diff options
author | Nick Todd <Nick.Todd@Sun.COM> | 2008-09-18 20:50:09 +0100 |
---|---|---|
committer | Nick Todd <Nick.Todd@Sun.COM> | 2008-09-18 20:50:09 +0100 |
commit | 8793b36b40d14ad0a0fecc97738dc118a928f46c (patch) | |
tree | 2462e794aa4e591ef023a67fc2e4fb157003ba8e /usr/src/uts/common | |
parent | a9520aaebd92fe63e5034e135e59fe8737234d80 (diff) | |
download | illumos-joyent-8793b36b40d14ad0a0fecc97738dc118a928f46c.tar.gz |
6733185 Further cleanup of SUN Studio 12 lint warnings in ON source.
6365532 socketvar.h strangles lint for everyone
5002763 Sockfs debug macros should be linted
6746261 _mkarglst accidentally exported from libc.
Diffstat (limited to 'usr/src/uts/common')
31 files changed, 122 insertions, 151 deletions
diff --git a/usr/src/uts/common/disp/disp.c b/usr/src/uts/common/disp/disp.c index 2770ef10f2..52ef3636ce 100644 --- a/usr/src/uts/common/disp/disp.c +++ b/usr/src/uts/common/disp/disp.c @@ -27,8 +27,6 @@ /* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" /* from SVr4.0 1.30 */ - #include <sys/types.h> #include <sys/param.h> #include <sys/sysmacros.h> @@ -1831,7 +1829,7 @@ disp_swapped_setrun(kthread_t *tp) case TS_RUN: /* called from ts_update */ break; default: - panic("disp_swapped_setrun: tp: %p bad t_state", tp); + panic("disp_swapped_setrun: tp: %p bad t_state", (void *)tp); } } diff --git a/usr/src/uts/common/fs/sockfs/socksctp.c b/usr/src/uts/common/fs/sockfs/socksctp.c index 6037b33a3c..a5763b0b5f 100644 --- a/usr/src/uts/common/fs/sockfs/socksctp.c +++ b/usr/src/uts/common/fs/sockfs/socksctp.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/types.h> #include <sys/t_lock.h> #include <sys/param.h> @@ -416,7 +414,8 @@ sosctp_create(vnode_t *accessvp, int domain, int type, int protocol, } so = VTOSO(vp); - dprint(2, ("sosctp_create: %p domain %d type %d\n", so, domain, type)); + dprint(2, ("sosctp_create: %p domain %d type %d\n", + (void *)so, domain, type)); if (version == SOV_DEFAULT) { version = so_default_version; @@ -551,7 +550,7 @@ sosctp_accept(struct sonode *lso, int fflag, struct sonode **nsop) return ((error == ENOTCONN) ? ECONNABORTED : error); } - dprint(2, ("sosctp_accept: new %p\n", nso)); + dprint(2, ("sosctp_accept: new %p\n", (void *)nso)); *nsop = nso; return (0); @@ -1976,7 +1975,7 @@ sosctp_setsockopt(struct sonode *so, int level, int option_name, } } dprint(2, ("sosctp_setsockopt %p (%d) - conn %p %d %d id:%d\n", - ss, so->so_type, conn, level, option_name, id)); + (void *)ss, so->so_type, conn, level, option_name, id)); ASSERT(ssa == NULL || (ssa != NULL && conn != NULL)); if (conn != NULL) { @@ -2206,7 +2205,7 @@ sctp_sock_newconn(void *parenthandle, void *connind) return (NULL); } - dprint(2, ("sctp_stream_newconn: new %p\n", nso)); + dprint(2, ("sctp_stream_newconn: new %p\n", (void *)nso)); nss = SOTOSSO(nso); diff --git a/usr/src/uts/common/fs/sockfs/socksdp.c b/usr/src/uts/common/fs/sockfs/socksdp.c index 8ee0e808cf..7376783fc0 100755..100644 --- a/usr/src/uts/common/fs/sockfs/socksdp.c +++ b/usr/src/uts/common/fs/sockfs/socksdp.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/types.h> #include <sys/t_lock.h> #include <sys/param.h> @@ -357,7 +355,8 @@ sosdp_create(vnode_t *accessvp, int domain, int type, int protocol, } so = VTOSO(vp); - dprint(2, ("sosdp_create: %p domain %d type %d\n", so, domain, type)); + dprint(2, ("sosdp_create: %p domain %d type %d\n", (void *)so, + domain, type)); if (version == SOV_DEFAULT) { version = so_default_version; @@ -455,7 +454,7 @@ sosdp_accept(struct sonode *lso, int fflag, struct sonode **nsop) */ (void) sosdp_getpeername(nso); - dprint(2, ("sosdp_accept: new %p\n", nso)); + dprint(2, ("sosdp_accept: new %p\n", (void *)nso)); *nsop = nso; return (0); @@ -1296,7 +1295,7 @@ sdp_sock_newconn(void *parenthandle, void *connind) return (NULL); } - dprint(2, ("sdp_stream_newconn: new %p\n", nso)); + dprint(2, ("sdp_stream_newconn: new %p\n", (void *)nso)); nss = SOTOSDO(nso); /* diff --git a/usr/src/uts/common/fs/sockfs/socksdpvnops.c b/usr/src/uts/common/fs/sockfs/socksdpvnops.c index 76de32e406..395599daab 100755..100644 --- a/usr/src/uts/common/fs/sockfs/socksdpvnops.c +++ b/usr/src/uts/common/fs/sockfs/socksdpvnops.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/types.h> #include <sys/t_lock.h> #include <sys/param.h> @@ -184,7 +182,8 @@ socksdpv_close(struct vnode *vp, int flag, int count, offset_t offset, ASSERT(so->so_count > 0); so->so_count--; /* one fewer open reference */ - dprint(2, ("socksdpv_close: %p so_count %d\n", so, so->so_count)); + dprint(2, ("socksdpv_close: %p so_count %d\n", (void *)so, + so->so_count)); if (so->so_count == 0) { /* diff --git a/usr/src/uts/common/fs/tmpfs/tmp_tnode.c b/usr/src/uts/common/fs/tmpfs/tmp_tnode.c index 7cae0dbe8e..51e57b2611 100644 --- a/usr/src/uts/common/fs/tmpfs/tmp_tnode.c +++ b/usr/src/uts/common/fs/tmpfs/tmp_tnode.c @@ -19,12 +19,10 @@ * CDDL HEADER END */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/types.h> #include <sys/param.h> #include <sys/t_lock.h> @@ -142,7 +140,7 @@ tmpnode_growmap(struct tmpnode *tp, ulong_t newsize) return; if (newsize > MAXOFF_T) - np = btopr(MAXOFF_T); + np = btopr((u_offset_t)MAXOFF_T); if (tp->tn_anon == NULL) { tp->tn_anon = anon_create(MAX(np, TMP_INIT_SZ), ANON_SLEEP); diff --git a/usr/src/uts/common/inet/ip/ip.c b/usr/src/uts/common/inet/ip/ip.c index 0950610206..d28bc10425 100644 --- a/usr/src/uts/common/inet/ip/ip.c +++ b/usr/src/uts/common/inet/ip/ip.c @@ -13758,7 +13758,7 @@ ip_check_and_align_header(queue_t *q, mblk_t *mp, ip_stack_t *ipst) (void) mi_strlog(q, 1, SL_ERROR|SL_TRACE, "ip_check_and_align_header: %s forced us to " " pullup pkt, hdr len %ld, hdr addr %p", - ill->ill_name, len, ipha); + ill->ill_name, len, (void *)ipha); } if (!pullupmsg(mp, IP_SIMPLE_HDR_LENGTH)) { /* clear b_prev - used by ip_mroute_decap */ diff --git a/usr/src/uts/common/inet/ip/ip_if.c b/usr/src/uts/common/inet/ip/ip_if.c index 9de6293245..cc05e27958 100644 --- a/usr/src/uts/common/inet/ip/ip_if.c +++ b/usr/src/uts/common/inet/ip/ip_if.c @@ -6507,7 +6507,8 @@ th_trace_gethash(ip_stack_t *ipst) if ((thh = kmem_alloc(sizeof (*thh), KM_NOSLEEP)) == NULL) return (NULL); - (void) snprintf(name, sizeof (name), "th_trace_%p", curthread); + (void) snprintf(name, sizeof (name), "th_trace_%p", + (void *)curthread); /* * We use mod_hash_create_extended here rather than the more diff --git a/usr/src/uts/common/inet/nca/nca.h b/usr/src/uts/common/inet/nca/nca.h index cbe62ca0ff..1670c49d5d 100644 --- a/usr/src/uts/common/inet/nca/nca.h +++ b/usr/src/uts/common/inet/nca/nca.h @@ -19,15 +19,13 @@ * CDDL HEADER END */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #ifndef _INET_NCA_H #define _INET_NCA_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif @@ -296,8 +294,8 @@ typedef struct tw_s { clock_t lbolt1; /* phase1 lbolt value (0 = NONE) */ clock_t lbolt2; /* phase2 lbolt value */ clock_t lbolt3; /* phase3 lbolt value */ - struct conn_s *head; /* Head of nca_conn_t list */ - struct conn_s *tail; /* Tail of nca_conn_t list */ + struct nca_conn_s *head; /* Head of nca_conn_t list */ + struct nca_conn_s *tail; /* Tail of nca_conn_t list */ timeout_id_t tid; /* Timer id of pending timeout() (0 = NONE) */ void *ep; /* pointer to encapsulating struct */ } tw_t; @@ -379,8 +377,8 @@ typedef struct node_s { nodef_t *ctaghashfanout; /* ctaghash bucket we're part off */ struct node_s *hashnext; /* hash list next node_t */ struct node_s *ctaghashnext; /* ctaghash list next node_t */ - struct conn_s *connhead; /* head of list of conn(s) in miss */ - struct conn_s *conntail; /* tail of list of conn(s) in miss */ + struct nca_conn_s *connhead; /* head of list of conn(s) in miss */ + struct nca_conn_s *conntail; /* tail of list of conn(s) in miss */ struct node_s *next; /* needed if data is in chunks */ struct node_s *back; /* needed if data is in chunks */ @@ -727,7 +725,7 @@ extern struct node_ts *node_tp; #define DOOR_STK_DEPTH 6 struct door_ts { - struct conn_s *cp; + struct nca_conn_s *cp; unsigned action; node_t *np; int ref; @@ -1086,7 +1084,7 @@ typedef struct if_s { typedef struct connf_s { uint32_t max; - struct conn_s *head; + struct nca_conn_s *head; kmutex_t lock; } connf_t; @@ -1146,24 +1144,24 @@ typedef struct connp_s { #define TCP_XMIT_MAX_IX 5 /* Max xmit descriptors */ -typedef struct conn_s { +typedef struct nca_conn_s { int32_t ref; /* Reference counter */ te_t tcp_ti; /* TCP TIMER timer entry */ - struct conn_s *twnext; /* TIME_WAIT next */ - struct conn_s *twprev; /* TIME_WAIT prev */ + struct nca_conn_s *twnext; /* TIME_WAIT next */ + struct nca_conn_s *twprev; /* TIME_WAIT prev */ clock_t twlbolt; /* TIME_WAIT lbolt */ clock_t create; /* Create lbolt time */ connf_t *hashfanout; /* Hash bucket we're part of */ - struct conn_s *hashnext; /* Hash chain next */ - struct conn_s *hashprev; /* Hash chain prev */ + struct nca_conn_s *hashnext; /* Hash chain next */ + struct nca_conn_s *hashprev; /* Hash chain prev */ - struct conn_s *bindnext; /* Next conn_s in bind list. */ - struct conn_s *bindprev; /* Prev conn_s in bind list. */ + struct nca_conn_s *bindnext; /* Next conn_s in bind list. */ + struct nca_conn_s *bindprev; /* Prev conn_s in bind list. */ void *tbf; /* Pointer to bind hash list struct. */ /* * Note: atomic access of memebers above is guaranteed by the @@ -1201,7 +1199,7 @@ typedef struct conn_s { int reqrefersz; /* size of above */ char *requagent; /* HTTP "User-Agent:" string */ int requagentsz; /* size of above */ - struct conn_s *nodenext; /* Node_t nca_conn_t list */ + struct nca_conn_s *nodenext; /* Node_t nca_conn_t list */ clock_t http_count; /* HTTP Keep-Alive request count */ @@ -1230,8 +1228,8 @@ typedef struct conn_s { * Connection NCA_IO_DIRECT_SPLICE & NCA_IO_DIRECT_TEE reference, * see direct_splice and direct_tee below for type of send too. */ - struct conn_s *direct; /* nca_conn_t to send recv data too */ - mblk_t *direct_mp; /* mblk_t to use for tcp_close() */ + struct nca_conn_s *direct; /* nca_conn_t to send recv data too */ + mblk_t *direct_mp; /* mblk_t to use for tcp_close() */ /* * nca_conn_t state. diff --git a/usr/src/uts/common/inet/sctp/sctp_output.c b/usr/src/uts/common/inet/sctp/sctp_output.c index ca8b10aeba..dc4dd72630 100644 --- a/usr/src/uts/common/inet/sctp/sctp_output.c +++ b/usr/src/uts/common/inet/sctp/sctp_output.c @@ -35,11 +35,6 @@ #include <sys/strsun.h> #include <sys/strsubr.h> #include <sys/socketvar.h> -/* swilly code in sys/socketvar.h turns off DEBUG */ -#ifdef __lint -#define DEBUG -#endif - #include <inet/common.h> #include <inet/mi.h> #include <inet/ip.h> diff --git a/usr/src/uts/common/io/dls/dls_soft_ring.c b/usr/src/uts/common/io/dls/dls_soft_ring.c index a1ac10972c..078b9a9e4c 100644 --- a/usr/src/uts/common/io/dls/dls_soft_ring.c +++ b/usr/src/uts/common/io/dls/dls_soft_ring.c @@ -23,8 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * General Soft rings - Simulating Rx rings in S/W. * @@ -612,7 +610,7 @@ dls_soft_ring_enable(dls_channel_t dc, dl_capab_dls_t *soft_ringp) dip->di_soft_ring_size = 0; bzero(name, sizeof (name)); - (void) snprintf(name, sizeof (name), "dls_soft_ring_%p", dip); + (void) snprintf(name, sizeof (name), "dls_soft_ring_%p", (void *)dip); dip->di_soft_ring_list = soft_ring_set_create(name, S_RING_BIND_NONE, 0, S_RING_WORKER_ONLY, minclsyspri, soft_ringp->dls_ring_cnt); diff --git a/usr/src/uts/common/io/drm/ati_pcigart.c b/usr/src/uts/common/io/drm/ati_pcigart.c index df843fdd4a..4c236c1c53 100644 --- a/usr/src/uts/common/io/drm/ati_pcigart.c +++ b/usr/src/uts/common/io/drm/ati_pcigart.c @@ -34,8 +34,6 @@ * */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include "drmP.h" #define ATI_PCIGART_PAGE_SIZE 4096 /* PCI GART page size */ @@ -77,6 +75,7 @@ drm_ati_pcigart_init(drm_device_t *dev, drm_ati_pcigart_info *gart_info) pages = DRM_MIN(entry->pages, ATI_MAX_PCIGART_PAGES); bzero(pci_gart, ATI_PCIGART_TABLE_SIZE); + /*CONSTCOND*/ ASSERT(PAGE_SIZE >= ATI_PCIGART_PAGE_SIZE); dmah = entry->dmah_sg; diff --git a/usr/src/uts/common/io/nxge/nxge_ndd.c b/usr/src/uts/common/io/nxge/nxge_ndd.c index 022fac410c..90c8128428 100644 --- a/usr/src/uts/common/io/nxge/nxge_ndd.c +++ b/usr/src/uts/common/io/nxge/nxge_ndd.c @@ -23,8 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/nxge/nxge_impl.h> #include <sys/nxge/nxge_hio.h> @@ -1061,8 +1059,8 @@ nxge_param_get_rxdma_info(p_nxge_t nxgep, queue_t *q, p_mblk_t mp, caddr_t cp) rdc, p_dma_cfgp->rcr_timeout[rdc], p_dma_cfgp->rcr_threshold[rdc], - rbr_rings[rdc], - rbr_rings[rdc]->num_blocks, rcr_rings[rdc]); + (void *)rbr_rings[rdc], + rbr_rings[rdc]->num_blocks, (void *)rcr_rings[rdc]); ((mblk_t *)np)->b_wptr += print_len; buf_len -= print_len; } @@ -2300,7 +2298,7 @@ nxge_param_dump_ptrs(p_nxge_t nxgep, queue_t *q, p_mblk_t mp, caddr_t cp) print_len = snprintf((char *)((mblk_t *)np)->b_wptr, buf_len, "nxgep (nxge_t) $%p\n" "dev_regs (dev_regs_t) $%p\n", - nxgep, nxgep->dev_regs); + (void *)nxgep, (void *)nxgep->dev_regs); ADVANCE_PRINT_BUFFER(np, print_len, buf_len); @@ -2308,8 +2306,8 @@ nxge_param_dump_ptrs(p_nxge_t nxgep, queue_t *q, p_mblk_t mp, caddr_t cp) print_len = snprintf((char *)((mblk_t *)np)->b_wptr, buf_len, "reg base (npi_reg_ptr_t) $%p\t " "pci reg (npi_reg_ptr_t) $%p\n", - nxgep->dev_regs->nxge_regp, - nxgep->dev_regs->nxge_pciregp); + (void *)nxgep->dev_regs->nxge_regp, + (void *)nxgep->dev_regs->nxge_pciregp); ADVANCE_PRINT_BUFFER(np, print_len, buf_len); @@ -2341,8 +2339,8 @@ nxge_param_dump_ptrs(p_nxge_t nxgep, queue_t *q, p_mblk_t mp, caddr_t cp) for (rdc = 0; rdc < p_cfgp->max_rdcs; rdc++) { print_len = snprintf((char *)((mblk_t *)np)->b_wptr, buf_len, " %d\t $%p\t\t $%p\n", - rdc, rcr_rings[rdc], - rbr_rings[rdc]); + rdc, (void *)rcr_rings[rdc], + (void *)rbr_rings[rdc]); ADVANCE_PRINT_BUFFER(np, print_len, buf_len); } @@ -2353,7 +2351,7 @@ nxge_param_dump_ptrs(p_nxge_t nxgep, queue_t *q, p_mblk_t mp, caddr_t cp) tx_rings = nxgep->tx_rings->rings; for (tdc = 0; tdc < p_cfgp->tdc.count; tdc++) { print_len = snprintf((char *)((mblk_t *)np)->b_wptr, buf_len, - " %d\t $%p\n", tdc, tx_rings[tdc]); + " %d\t $%p\n", tdc, (void *)tx_rings[tdc]); ADVANCE_PRINT_BUFFER(np, print_len, buf_len); } diff --git a/usr/src/uts/common/io/usb/usba/usba_devdb.c b/usr/src/uts/common/io/usb/usba/usba_devdb.c index dbd8ee7717..f442abea43 100644 --- a/usr/src/uts/common/io/usb/usba/usba_devdb.c +++ b/usr/src/uts/common/io/usb/usba/usba_devdb.c @@ -417,7 +417,7 @@ usba_devdb_compare(const void *p1, const void *p2) USB_DPRINTF_L4(DPRINT_MASK_DEVDB, usba_devdb_log_handle, "usba_devdb_compare: p1=0x%p u1=0x%p p2=0x%p u2=0x%p", - p1, (void *)u1, p2, u2); + p1, (void *)u1, p2, (void *)u2); /* first match vendor id */ if (u1->idVendor < u2->idVendor) { diff --git a/usr/src/uts/common/io/usb/usba/usba_ugen.c b/usr/src/uts/common/io/usb/usba/usba_ugen.c index 2613560d5a..cb20c24270 100644 --- a/usr/src/uts/common/io/usb/usba/usba_ugen.c +++ b/usr/src/uts/common/io/usb/usba/usba_ugen.c @@ -22,7 +22,6 @@ * Use is subject to license terms. */ - /* * UGEN: USB Generic Driver support code * @@ -4282,7 +4281,7 @@ ugen_minor_index_create(ugen_state_t *ugenp, ugen_minor_t minor) USB_DPRINTF_L4(UGEN_PRINT_ATTA, ugenp->ug_log_hdl, "ugen_minor_index_create: %d: 0x%lx", ugenp->ug_minor_node_table_index, - minor); + (unsigned long)minor); return (ugenp->ug_minor_node_table_index++); } else { diff --git a/usr/src/uts/common/io/usb/usba/usbai_register.c b/usr/src/uts/common/io/usb/usba/usbai_register.c index 6f4d96d65b..c1b66d17d7 100644 --- a/usr/src/uts/common/io/usb/usba/usbai_register.c +++ b/usr/src/uts/common/io/usb/usba/usbai_register.c @@ -23,7 +23,6 @@ * Use is subject to license terms. */ - /* * USBA: Solaris USB Architecture support * @@ -1312,7 +1311,7 @@ usba_make_alts_sparse(usb_alt_if_data_t **array, uint_t *n_elements) /* Place in sparse array based on key. */ USB_DPRINTF_L4(DPRINT_MASK_REGISTER, usbai_reg_log_handle, "move %lu bytes (key %d) from 0x%p to 0x%p", - sizeof (usb_alt_if_data_t), curr_value, + (unsigned long)sizeof (usb_alt_if_data_t), curr_value, (void *)&orig_addr[i], (void *)&repl_array[curr_value]); bcopy((char *)&orig_addr[i], (char *)&repl_array[curr_value], diff --git a/usr/src/uts/common/os/kcpc.c b/usr/src/uts/common/os/kcpc.c index df255cac93..8c9a135243 100644 --- a/usr/src/uts/common/os/kcpc.c +++ b/usr/src/uts/common/os/kcpc.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/param.h> #include <sys/thread.h> #include <sys/cpuvar.h> @@ -471,7 +469,7 @@ kcpc_unbind(kcpc_set_t *set) if (removectx(t, ctx, kcpc_save, kcpc_restore, NULL, kcpc_lwp_create, NULL, kcpc_free) == 0) panic("kcpc_unbind: context %p not preset on thread %p", - ctx, t); + (void *)ctx, (void *)t); #else (void) removectx(t, ctx, kcpc_save, kcpc_restore, NULL, kcpc_lwp_create, NULL, kcpc_free); diff --git a/usr/src/uts/common/os/lgrp_topo.c b/usr/src/uts/common/os/lgrp_topo.c index 6d14dd926f..43d565a039 100644 --- a/usr/src/uts/common/os/lgrp_topo.c +++ b/usr/src/uts/common/os/lgrp_topo.c @@ -19,12 +19,10 @@ * CDDL HEADER END */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * lgroup topology */ @@ -266,7 +264,7 @@ lgrp_ancestor_delete(lgrp_t *child, klgrpset_t *changed) #ifdef DEBUG if (lgrp_topo_debug > 1) { prom_printf("lgrp_ancestor_delete(0x%p[%d],0x%p)\n", - child, child->lgrp_id, changed); + (void *)child, child->lgrp_id, (void *)changed); } #endif /* DEBUG */ @@ -307,7 +305,7 @@ lgrp_ancestor_delete(lgrp_t *child, klgrpset_t *changed) if (lgrp_topo_debug > 0) prom_printf("lgrp_ancestor_delete: destroy" " lgrp %d at 0x%p\n", - current->lgrp_id, current); + current->lgrp_id, (void *)current); #endif /* DEBUG */ lgrp_destroy(current); } @@ -344,7 +342,8 @@ lgrp_consolidate(lgrp_t *lgrp1, lgrp_t *lgrp2, klgrpset_t *changed) #ifdef DEBUG if (lgrp_topo_debug > 0) prom_printf("lgrp_consolidate(0x%p[%d],0x%p[%d],0x%p)\n", - lgrp1, lgrp1->lgrp_id, lgrp2, lgrp2->lgrp_id, changed); + (void *)lgrp1, lgrp1->lgrp_id, (void *)lgrp2, + lgrp2->lgrp_id, (void *)changed); #endif /* DEBUG */ count = 0; @@ -416,7 +415,7 @@ lgrp_consolidate(lgrp_t *lgrp1, lgrp_t *lgrp2, klgrpset_t *changed) #ifdef DEBUG if (lgrp_topo_debug > 0) prom_printf("lgrp_consolidate: destroy lgrp %d at 0x%p\n", - lgrp1->lgrp_id, lgrp1); + lgrp1->lgrp_id, (void *)lgrp1); if (lgrp_topo_debug > 1 && changed) prom_printf("lgrp_consolidate: changed %d lgrps: 0x%llx\n", count, (u_longlong_t)*changed); @@ -477,7 +476,7 @@ lgrp_collapse_dups(klgrpset_t target_set, int equidist_only, if (lgrp_topo_debug > 1) prom_printf("lgrp_collapse_dups: find " "dups of lgrp %d at 0x%p\n", - target->lgrp_id, target); + target->lgrp_id, (void *)target); #endif /* DEBUG */ keep = NULL; for (j = 0; j <= lgrp_alloc_max; j++) { @@ -508,7 +507,7 @@ lgrp_collapse_dups(klgrpset_t target_set, int equidist_only, if (lgrp_topo_debug > 1) prom_printf("lgrp_collapse_dups: " "keep lgrp %d at 0x%p\n", - keep->lgrp_id, keep); + keep->lgrp_id, (void *)keep); #endif /* DEBUG */ } else { if (lgrp == lgrp_root) { @@ -520,8 +519,8 @@ lgrp_collapse_dups(klgrpset_t target_set, int equidist_only, prom_printf("lgrp_collapse_dups:" " consolidate lgrp %d at 0x%p" " into lgrp %d at 0x%p\n", - lgrp->lgrp_id, lgrp, - keep->lgrp_id, keep); + lgrp->lgrp_id, (void *)lgrp, + keep->lgrp_id, (void *)keep); #endif /* DEBUG */ count += lgrp_consolidate(lgrp, keep, &changes); @@ -645,14 +644,14 @@ lgrp_proprogate(lgrp_t *newleaf, lgrp_t *child, int latency, if (lgrp_topo_debug > 1) { prom_printf("lgrp_proprogate: newleaf %d(0x%p), " "latency %d, child %d(0x%p), parent %d(0x%p)\n", - newleaf->lgrp_id, newleaf, latency, child->lgrp_id, - child, parent->lgrp_id, parent); + newleaf->lgrp_id, (void *)newleaf, latency, child->lgrp_id, + (void *)child, parent->lgrp_id, (void *)parent); prom_printf("lgrp_proprogate: parent's leaves becomes 0x%llx\n", (u_longlong_t)parent->lgrp_leaves); } if (lgrp_topo_debug > 0) { prom_printf("lgrp_proprogate: adding to parent %d (0x%p)\n", - parent->lgrp_id, parent); + parent->lgrp_id, (void *)parent); lgrp_rsets_print("parent resources become:", parent->lgrp_set); } @@ -699,8 +698,9 @@ lgrp_split(lgrp_t *oldleaf, lgrp_t *newleaf, lgrp_t *child, #ifdef DEBUG if (lgrp_topo_debug > 1) prom_printf("lgrp_split(0x%p[%d],0x%p[%d],0x%p[%d],0x%p)\n", - oldleaf, oldleaf->lgrp_id, newleaf, newleaf->lgrp_id, - child, child->lgrp_id, changed); + (void *)oldleaf, oldleaf->lgrp_id, + (void *)newleaf, newleaf->lgrp_id, + (void *)child, child->lgrp_id, (void *)changed); #endif /* DEBUG */ /* @@ -778,7 +778,8 @@ lgrp_split(lgrp_t *oldleaf, lgrp_t *newleaf, lgrp_t *child, if (lgrp_topo_debug > 0) { prom_printf("lgrp_split: new parent %d (0x%p) for" " lgrp %d (0x%p)\n", - parent->lgrp_id, parent, child->lgrp_id, child); + parent->lgrp_id, (void *)parent, + child->lgrp_id, (void *)child); lgrp_rsets_print("new parent resources:", parent->lgrp_set); } @@ -854,8 +855,9 @@ lgrp_lineage_add(lgrp_t *newleaf, lgrp_t *oldleaf, klgrpset_t *changed) #ifdef DEBUG if (lgrp_topo_debug > 0) prom_printf("\nlgrp_lineage_add(0x%p[%d],0x%p[%d],0x%p)\n", - newleaf, newleaf->lgrp_id, oldleaf, oldleaf->lgrp_id, - changed); + (void *)newleaf, newleaf->lgrp_id, + (void *)oldleaf, oldleaf->lgrp_id, + (void *)changed); #endif /* DEBUG */ /* @@ -903,7 +905,8 @@ lgrp_lineage_add(lgrp_t *newleaf, lgrp_t *oldleaf, klgrpset_t *changed) if (lgrp_topo_debug > 1) prom_printf("lgrp_lineage_add: child %d (0x%p), parent" " %d (0x%p)\n", - child->lgrp_id, child, parent->lgrp_id, parent); + child->lgrp_id, (void *)child, + parent->lgrp_id, (void *)parent); #endif /* DEBUG */ /* @@ -987,7 +990,7 @@ lgrp_lineage_add(lgrp_t *newleaf, lgrp_t *oldleaf, klgrpset_t *changed) prom_printf("lgrp_lineage_add: " "replaced parent lgrp %d at 0x%p" " for lgrp %d\n", - parent->lgrp_id, parent, + parent->lgrp_id, (void *)parent, child->lgrp_id); lgrp_rsets_print("old parent" " resources:", parent->lgrp_set); @@ -1020,7 +1023,7 @@ lgrp_lineage_add(lgrp_t *newleaf, lgrp_t *oldleaf, klgrpset_t *changed) prom_printf("lgrp_lineage_add: new " "parent lgrp %d at 0x%p for " "lgrp %d\n", intermed->lgrp_id, - intermed, child->lgrp_id); + (void *)intermed, child->lgrp_id); lgrp_rsets_print("new parent " "resources:", rset); } @@ -1101,7 +1104,8 @@ lgrp_leaf_add(lgrp_t *leaf, lgrp_t **lgrps, int lgrp_count, #ifdef DEBUG if (lgrp_topo_debug > 1) prom_printf("\nlgrp_leaf_add(0x%p[%d],0x%p,%d,0x%p)\n", - leaf, leaf->lgrp_id, lgrps, lgrp_count, changed); + (void *)leaf, leaf->lgrp_id, (void *)lgrps, lgrp_count, + (void *)changed); #endif /* DEBUG */ count = 0; @@ -1172,7 +1176,7 @@ lgrp_leaf_add(lgrp_t *leaf, lgrp_t **lgrps, int lgrp_count, if (lgrp_topo_debug > 1) prom_printf("lgrp_leaf_add: skip " "lgrp %d at 0x%p\n", - lgrp->lgrp_id, lgrp); + lgrp->lgrp_id, (void *)lgrp); #endif /* DEBUG */ continue; } @@ -1181,7 +1185,8 @@ lgrp_leaf_add(lgrp_t *leaf, lgrp_t **lgrps, int lgrp_count, if (lgrp_topo_debug > 0) prom_printf("lgrp_leaf_add: lgrp %d (0x%p) =>" " lgrp %d (0x%p)\n", - leaf->lgrp_id, leaf, lgrp->lgrp_id, lgrp); + leaf->lgrp_id, (void *)leaf, lgrp->lgrp_id, + (void *)lgrp); #endif /* DEBUG */ count += lgrp_lineage_add(leaf, lgrp, &changes); @@ -1233,7 +1238,8 @@ lgrp_leaf_delete(lgrp_t *leaf, lgrp_t **lgrps, int lgrp_count, #ifdef DEBUG if (lgrp_topo_debug > 0) prom_printf("lgrp_leaf_delete(0x%p[%d],0x%p,%d,0x%p)\n", - leaf, leaf->lgrp_id, lgrps, lgrp_count, changed); + (void *)leaf, leaf->lgrp_id, (void *)lgrps, lgrp_count, + (void *)changed); #endif /* DEBUG */ /* @@ -1248,7 +1254,7 @@ lgrp_leaf_delete(lgrp_t *leaf, lgrp_t **lgrps, int lgrp_count, #ifdef DEBUG if (lgrp_topo_debug > 0) prom_printf("lgrp_leaf_delete: remove leaf from" - " lgrp %d at %p\n", lgrp->lgrp_id, lgrp); + " lgrp %d at %p\n", lgrp->lgrp_id, (void *)lgrp); #endif /* DEBUG */ lgrp_rsets_delete(lgrp, leaf->lgrp_id, 0); @@ -1465,7 +1471,8 @@ lgrp_topo_update(lgrp_t **lgrps, int lgrp_count, klgrpset_t *changed) #ifdef DEBUG if (lgrp_topo_debug > 1) { prom_printf("\nlgrp_topo_update: updating lineage " - "of lgrp %d at 0x%p\n", lgrp->lgrp_id, lgrp); + "of lgrp %d at 0x%p\n", lgrp->lgrp_id, + (void *)lgrp); } #endif /* DEBUG */ @@ -1513,7 +1520,7 @@ lgrp_print(lgrp_t *lgrp) lgrp_rsets_print("\tresources", lgrp->lgrp_set); parent = lgrp->lgrp_parent; - prom_printf("\tparent 0x%p", parent); + prom_printf("\tparent 0x%p", (void *)parent); if (parent) prom_printf("[%d]\n", parent->lgrp_id); else diff --git a/usr/src/uts/common/os/mutex.c b/usr/src/uts/common/os/mutex.c index f812aeb6bc..625e3a6ca2 100644 --- a/usr/src/uts/common/os/mutex.c +++ b/usr/src/uts/common/os/mutex.c @@ -23,8 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * Big Theory Statement for mutual exclusion locking primitives. * @@ -249,7 +247,8 @@ mutex_panic(char *msg, mutex_impl_t *lp) panic_mutex = *lp; panic("%s, lp=%p owner=%p thread=%p", - msg, lp, MUTEX_OWNER(&panic_mutex), curthread); + msg, (void *)lp, (void *)MUTEX_OWNER(&panic_mutex), + (void *)curthread); } /* "tunables" for per-platform backoff constants. */ @@ -655,7 +654,7 @@ lock_set_spin(lock_t *lp) return; if (ncpus == 1) - panic("lock_set: %p lock held and only one CPU", lp); + panic("lock_set: %p lock held and only one CPU", (void *)lp); spin_time = LOCKSTAT_START_TIME(LS_LOCK_SET_SPIN); @@ -689,7 +688,8 @@ lock_set_spl_spin(lock_t *lp, int new_pil, ushort_t *old_pil_addr, int old_pil) return; if (ncpus == 1) - panic("lock_set_spl: %p lock held and only one CPU", lp); + panic("lock_set_spl: %p lock held and only one CPU", + (void *)lp); ASSERT(new_pil > LOCK_LEVEL); diff --git a/usr/src/uts/common/os/rwlock.c b/usr/src/uts/common/os/rwlock.c index 7e0daa89bc..4c5e6c4360 100644 --- a/usr/src/uts/common/os/rwlock.c +++ b/usr/src/uts/common/os/rwlock.c @@ -23,8 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/param.h> #include <sys/thread.h> #include <sys/cmn_err.h> @@ -182,7 +180,7 @@ rw_panic(char *msg, rwlock_impl_t *lp) panic_rwlock = *lp; panic("%s, lp=%p wwwh=%lx thread=%p", - msg, lp, panic_rwlock.rw_wwwh, curthread); + msg, (void *)lp, panic_rwlock.rw_wwwh, (void *)curthread); } /* ARGSUSED */ diff --git a/usr/src/uts/common/os/turnstile.c b/usr/src/uts/common/os/turnstile.c index 4175973c47..d68844ea26 100644 --- a/usr/src/uts/common/os/turnstile.c +++ b/usr/src/uts/common/os/turnstile.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * Big Theory Statement for turnstiles. * @@ -752,7 +750,7 @@ turnstile_wakeup(turnstile_t *ts, int qnum, int nthreads, kthread_t *owner) thread_unlock_high(t); /* drop run queue lock */ } if (owner != NULL) - panic("turnstile_wakeup: owner %p not woken", owner); + panic("turnstile_wakeup: owner %p not woken", (void *)owner); disp_lock_exit(&tc->tc_lock); } diff --git a/usr/src/uts/common/os/waitq.c b/usr/src/uts/common/os/waitq.c index 276026a02e..7ef7d630f9 100644 --- a/usr/src/uts/common/os/waitq.c +++ b/usr/src/uts/common/os/waitq.c @@ -19,12 +19,10 @@ * CDDL HEADER END */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/param.h> #include <sys/systm.h> #include <sys/thread.h> @@ -296,7 +294,7 @@ waitq_setrun(kthread_t *t) ASSERT(ISWAITING(t)); if (wq == NULL) - panic("waitq_setrun: thread %p is not on waitq", t); + panic("waitq_setrun: thread %p is not on waitq", (void *)t); waitq_dequeue(wq, t); CL_SETRUN(t); } diff --git a/usr/src/uts/common/sys/cpuvar.h b/usr/src/uts/common/sys/cpuvar.h index 5884d72789..6e7bb85673 100644 --- a/usr/src/uts/common/sys/cpuvar.h +++ b/usr/src/uts/common/sys/cpuvar.h @@ -27,8 +27,6 @@ #ifndef _SYS_CPUVAR_H #define _SYS_CPUVAR_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/thread.h> #include <sys/sysinfo.h> /* has cpu_stat_t definition */ #include <sys/disp.h> diff --git a/usr/src/uts/common/sys/param.h b/usr/src/uts/common/sys/param.h index 26798570a5..0279968fc8 100644 --- a/usr/src/uts/common/sys/param.h +++ b/usr/src/uts/common/sys/param.h @@ -39,8 +39,6 @@ #ifndef _SYS_PARAM_H #define _SYS_PARAM_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifndef _ASM /* Avoid typedef headaches for assembly files */ #include <sys/types.h> #include <sys/isa_defs.h> @@ -339,6 +337,17 @@ extern uintptr_t _userlimit; extern uintptr_t _userlimit32; #endif /* defined(_KERNEL) && !defined(_ASM) */ +/* + * These three variables have been added within the #if defined(lint) + * below to ensure visibility to lint. This is a short term workaround + * to handle poor interaction between SS12 lint and these variables. + * CR 6742611 has been logged to address these issues. + */ +#if defined(lint) +extern int snooping; +extern uint_t snoop_interval; +extern const unsigned int _pageshift; +#endif /* lint */ #if !defined(_MACHDEP) diff --git a/usr/src/uts/common/sys/socketvar.h b/usr/src/uts/common/sys/socketvar.h index 178a8a2905..37a699345a 100644 --- a/usr/src/uts/common/sys/socketvar.h +++ b/usr/src/uts/common/sys/socketvar.h @@ -40,8 +40,6 @@ #ifndef _SYS_SOCKETVAR_H #define _SYS_SOCKETVAR_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/types.h> #include <sys/stream.h> #include <sys/t_lock.h> @@ -651,7 +649,7 @@ int so_verify_oobstate(struct sonode *); /* * DEBUG macros */ -#if defined(DEBUG) && !defined(__lint) +#if defined(DEBUG) #define SOCK_DEBUG extern int sockdebug; @@ -670,13 +668,13 @@ extern int sockprinterr; #define eprintsoline(so, error) \ { if (sockprinterr && ((so)->so_options & SO_DEBUG)) \ printf("socket(%p) error %d: line %d file %s\n", \ - (so), (error), __LINE__, __FILE__); \ + (void *)(so), (error), __LINE__, __FILE__); \ } #define dprint(level, args) { if (sockdebug > (level)) printf args; } #define dprintso(so, level, args) \ { if (sockdebug > (level) && ((so)->so_options & SO_DEBUG)) printf args; } -#else /* define(DEBUG) && !defined(__lint) */ +#else /* define(DEBUG) */ #define eprint(args) {} #define eprintso(so, args) {} @@ -684,11 +682,8 @@ extern int sockprinterr; #define eprintsoline(so, error) {} #define dprint(level, args) {} #define dprintso(so, level, args) {} -#ifdef DEBUG -#undef DEBUG -#endif -#endif /* defined(DEBUG) && !defined(__lint) */ +#endif /* defined(DEBUG) */ extern struct vfsops sock_vfsops; extern struct vnodeops *socktpi_vnodeops; diff --git a/usr/src/uts/common/syscall/sendfile.c b/usr/src/uts/common/syscall/sendfile.c index 18f7ccb9ed..2ff310cde4 100644 --- a/usr/src/uts/common/syscall/sendfile.c +++ b/usr/src/uts/common/syscall/sendfile.c @@ -53,10 +53,6 @@ #include <sys/socket.h> #include <sys/socketvar.h> -/* swilly code in sys/socketvar.h turns off DEBUG */ -#ifdef __lint -#define DEBUG -#endif #include <netinet/in.h> #include <sys/sendfile.h> diff --git a/usr/src/uts/common/vm/seg_map.c b/usr/src/uts/common/vm/seg_map.c index ad18a2cb31..5a46d23e6f 100644 --- a/usr/src/uts/common/vm/seg_map.c +++ b/usr/src/uts/common/vm/seg_map.c @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -31,8 +31,6 @@ * under license from the Regents of the University of California. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * VM - generic vnode mapping segment. * @@ -1821,6 +1819,8 @@ vrfy_smp: /* * Use segkpm */ + /* Lint directive required until 6746211 is fixed */ + /*CONSTCOND*/ ASSERT(PAGESIZE == MAXBSIZE); /* diff --git a/usr/src/uts/common/vm/vm_anon.c b/usr/src/uts/common/vm/vm_anon.c index 3f3502036d..c3ccd9bd14 100644 --- a/usr/src/uts/common/vm/vm_anon.c +++ b/usr/src/uts/common/vm/vm_anon.c @@ -36,8 +36,6 @@ * contributors. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * VM - anonymous pages. * @@ -2398,7 +2396,7 @@ anon_private( * but to do so now. */ panic("anon_private, ppcopy failed, opp = 0x%p, pp = 0x%p", - opp, pp); + (void *)opp, (void *)pp); } hat_setrefmod(pp); /* mark as modified */ diff --git a/usr/src/uts/common/vm/vm_page.c b/usr/src/uts/common/vm/vm_page.c index a0a9067065..b897f2004f 100644 --- a/usr/src/uts/common/vm/vm_page.c +++ b/usr/src/uts/common/vm/vm_page.c @@ -36,8 +36,6 @@ * contributors. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * VM - physical page management. */ @@ -2645,7 +2643,7 @@ page_free(page_t *pp, int dontneed) if (hat_page_is_mapped(pp) || pp->p_lckcnt != 0 || pp->p_cowcnt != 0 || pp->p_slckcnt != 0) { panic("page_free pp=%p, pfn=%lx, lckcnt=%d, cowcnt=%d " - "slckcnt = %d", pp, page_pptonum(pp), pp->p_lckcnt, + "slckcnt = %d", (void *)pp, page_pptonum(pp), pp->p_lckcnt, pp->p_cowcnt, pp->p_slckcnt); /*NOTREACHED*/ } @@ -6393,7 +6391,8 @@ page_capture_add_hash(page_t *pp, uint_t szc, uint_t flags, void *datap) while (tp1 != &page_capture_hash[index].lists[l]) { if (tp1->pp == pp) { panic("page pp 0x%p already on hash " - "at 0x%p\n", pp, tp1); + "at 0x%p\n", + (void *)pp, (void *)tp1); } tp1 = tp1->next; } @@ -6460,7 +6459,8 @@ page_capture_add_hash(page_t *pp, uint_t szc, uint_t flags, void *datap) * and thus it either has to be set or not set and can't change * while holding the mutex above. */ - panic("page_capture_add_hash, PR_CAPTURE flag set on pp %p\n", pp); + panic("page_capture_add_hash, PR_CAPTURE flag set on pp %p\n", + (void *)pp); } /* @@ -6855,7 +6855,7 @@ page_capture_take_action(page_t *pp, uint_t flags, void *datap) bp2 = bp2->next; } } - panic("PR_CAPTURE set but not on hash for pp 0x%p\n", pp); + panic("PR_CAPTURE set but not on hash for pp 0x%p\n", (void *)pp); /*NOTREACHED*/ } diff --git a/usr/src/uts/common/xen/io/xdf.c b/usr/src/uts/common/xen/io/xdf.c index fbc54dd5a8..d1ca51ffc0 100644 --- a/usr/src/uts/common/xen/io/xdf.c +++ b/usr/src/uts/common/xen/io/xdf.c @@ -999,7 +999,7 @@ xdf_dump(dev_t dev, caddr_t addr, daddr_t blkno, int nblk) return (ENXIO); DPRINTF(IO_DBG, ("xdf: dump addr (0x%p) blk (%ld) nblks (%d)\n", - addr, blkno, nblk)); + (void *)addr, blkno, nblk)); part = XDF_PART(minor); if (!xdf_isopen(vdp, part)) diff --git a/usr/src/uts/common/xen/io/xpvd.c b/usr/src/uts/common/xen/io/xpvd.c index 59fdd0bbc7..8b87801c0f 100644 --- a/usr/src/uts/common/xen/io/xpvd.c +++ b/usr/src/uts/common/xen/io/xpvd.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * Host to hypervisor virtual devices nexus driver * @@ -195,7 +193,7 @@ static ndi_event_hdl_t xpvd_ndi_event_handle; static struct modldrv modldrv = { &mod_driverops, /* Type of module */ - "virtual device nexus driver %I%", + "virtual device nexus driver", &xpvd_ops, /* driver ops */ }; @@ -873,7 +871,7 @@ i_xpvd_parse_devname(char *name, xendev_devclass_t *devclassp, */ /* Backend format is "<domain>,<vdev>". */ - if (sscanf(caddr, "%d,%d", domp, vdevp) == 2) { + if (sscanf(caddr, "%hu,%d", domp, vdevp) == 2) { ret = B_TRUE; goto done; } diff --git a/usr/src/uts/common/xen/os/xvdi.c b/usr/src/uts/common/xen/os/xvdi.c index 791445f2cc..46d7997874 100644 --- a/usr/src/uts/common/xen/os/xvdi.c +++ b/usr/src/uts/common/xen/os/xvdi.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * Xen virtual device driver interfaces */ @@ -2106,7 +2104,7 @@ i_xvdi_probe_path_handler(void *arg) goto done; } } else { - if (sscanf(p, "/%d/%d/", &dom, &vdev) != 2) { + if (sscanf(p, "/%hu/%d/", &dom, &vdev) != 2) { XVDI_DPRINTF(XVDI_DBG_PROBE, "i_xvdi_probe_path_handler: " "cannot parse backend path %s", |