From owner-p4-projects@FreeBSD.ORG Mon Aug 20 17:55:57 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8975A16A475; Mon, 20 Aug 2007 17:55:57 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5699216A420 for ; Mon, 20 Aug 2007 17:55:57 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4081E13C4B7 for ; Mon, 20 Aug 2007 17:55:57 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l7KHtve5073753 for ; Mon, 20 Aug 2007 17:55:57 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l7KHtuod073747 for perforce@freebsd.org; Mon, 20 Aug 2007 17:55:56 GMT (envelope-from fli@FreeBSD.org) Date: Mon, 20 Aug 2007 17:55:56 GMT Message-Id: <200708201755.l7KHtuod073747@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 125445 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Aug 2007 17:55:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=125445 Change 125445 by fli@fli_manticore on 2007/08/20 17:55:39 Fix compile warnings when DEBUG is undefined. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/clisrv.c#9 edit .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/dbrec.c#7 edit .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_packet.c#11 edit .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/var.c#3 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/clisrv.c#9 (text+ko) ==== @@ -393,8 +393,9 @@ "len=%d, suser=%d, sock=%d", csc, n, csc->csc_suser, sock); error = cp_parse(csc, buf, len, csc->csc_suser); - if (error != 0) + if (error != 0) { dprintf(DEBUG_CS, "Failed to parse packet csc=%x", csc); + } } MTX_UNLOCK(csc, csc_mtx); ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/dbrec.c#7 (text+ko) ==== @@ -1505,7 +1505,7 @@ * pr - Resource data from peers probe packet */ void -dbr_tiebreak(struct dbr *dbr, struct dbr_rec *dr, struct record *pr) +dbr_tiebreak(struct dbr *dbr __unused, struct dbr_rec *dr, struct record *pr) { struct record *r; struct record_type *rt, *prt; @@ -1594,8 +1594,9 @@ dprintf(DEBUG_DBR, "Lost tie-breaking on %ls", dr->dr_name); col_probe(dr); } - else if (outcome == 1) + else if (outcome == 1) { dprintf(DEBUG_DBR, "Won tie-breaking on %ls", dr->dr_name); + } } /* ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_packet.c#11 (text+ko) ==== @@ -1002,8 +1002,9 @@ } retval = 0; out: - if (retval != 0) + if (retval != 0) { dprintf(DEBUG_STACK, "Packet chain finalization failed"); + } return (retval); } ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/var.c#3 (text+ko) ==== @@ -221,7 +221,6 @@ update_var(struct vartag *vt, int flags) { int error; - size_t i; RW_WLOCK(vt, vt_lock); error = vt->vt_update(vt, flags); @@ -232,8 +231,10 @@ vt->vt_data[0].vtd_str); } else { +#ifdef DEBUG + size_t i; + dprintf(DEBUG_VAR, "Variable %s set to", vt->vt_name); -#ifdef DEBUG for (i = 0; i < vt->vt_size; i++) { dprintf(DEBUG_VAR, "\t%ls", vt->vt_data[i].vtd_str);