---------------------
PatchSet 10247 
Date: 2007/12/15 06:08:25
Author: adri
Branch: s27_adri
Tag: (none) 
Log:
strBuf() -> strBuf2()

Members: 
	src/store.c:1.49.4.3.4.5->1.49.4.3.4.6 

Index: squid/src/store.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/store.c,v
retrieving revision 1.49.4.3.4.5
retrieving revision 1.49.4.3.4.6
diff -u -r1.49.4.3.4.5 -r1.49.4.3.4.6
--- squid/src/store.c	14 Dec 2007 06:11:29 -0000	1.49.4.3.4.5
+++ squid/src/store.c	15 Dec 2007 06:08:25 -0000	1.49.4.3.4.6
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store.c,v 1.49.4.3.4.5 2007/12/14 06:11:29 adri Exp $
+ * $Id: store.c,v 1.49.4.3.4.6 2007/12/15 06:08:25 adri Exp $
  *
  * DEBUG: section 20    Storage Manager
  * AUTHOR: Harvest Derived
@@ -974,8 +974,10 @@
     state->seen_offset = offset;
     if (!strLen(e->mem_obj->reply->content_type) || strCmp(e->mem_obj->reply->content_type, "x-squid-internal/vary") != 0) {
 	/* This is not our Vary marker object. Bail out. */
-	debug(33, 1) ("storeLocateVary: Not our vary marker object, %s = '%s', '%.*s'/'%s'\n",
-	    storeKeyText(e->hash.key), e->mem_obj->url, strLen2(vary_data), strBuf2(vary_data), strBuf(accept_encoding) ? strBuf(accept_encoding) : "-");
+	debug(33, 1) ("storeLocateVary: Not our vary marker object, %s = '%s', '%.*s'/'%.*s'\n",
+	    storeKeyText(e->hash.key), e->mem_obj->url, strLen2(vary_data), strBuf2(vary_data),
+            strIsNotNull(accept_encoding) ? strLen2(accept_encoding) : 1,
+            strIsNotNull(accept_encoding) ? strBuf2(accept_encoding) : "-");
 	storeLocateVaryCallback(state);
 	return;
     }