PERFORCE change 125445 for review

[Fredrik Lindberg]

http://perforce.freebsd.org/chv.cgi?CH=125445

Change 125445 by fli at 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);