Bug #1344: Fails to compile with glibc -D_FORTIFY_SOURCE=2 (used by

Fedora Core 4 and others)

Forward port of 2.5 patch.

diff --git a/src/Packer.cc b/src/Packer.cc
index 7b831eddb5f8e86640d57dc3095823fd0c4bf2ca..53c19962663e34ac620e38c921b10e27c867e040 100644 (file)
--- a/src/Packer.cc
+++ b/src/Packer.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: Packer.cc,v 1.16 2003/02/21 22:50:06 robertc Exp $
+ * $Id: Packer.cc,v 1.17 2005/09/03 13:46:46 serassio Exp $
  *
  * DEBUG: section 60    Packer: A uniform interface to store-like modules
  * AUTHOR: Alex Rousskov
@@ -109,7 +109,7 @@ packerToStoreInit(Packer * p, StoreEntry * e)
 {
     assert(p && e);
     p->append = (append_f) store_append;
-    p->vprintf = (vprintf_f) store_vprintf;
+    p->packer_vprintf = (vprintf_f) store_vprintf;
     p->real_handler = e;
 }
 
@@ -119,7 +119,7 @@ packerToMemInit(Packer * p, MemBuf * mb)
 {
     assert(p && mb);
     p->append = (append_f) memBuf_append;
-    p->vprintf = (vprintf_f) memBuf_vprintf;
+    p->packer_vprintf = (vprintf_f) memBuf_vprintf;
     p->real_handler = mb;
 }
 
@@ -130,7 +130,7 @@ packerClean(Packer * p)
     assert(p);
     /* it is not really necessary to do this, but, just in case... */
     p->append = NULL;
-    p->vprintf = NULL;
+    p->packer_vprintf = NULL;
     p->real_handler = NULL;
 }
 
@@ -163,7 +163,7 @@ va_dcl
 #endif
 
     assert(p);
-    assert(p->real_handler && p->vprintf);
-    p->vprintf(p->real_handler, fmt, args);
+    assert(p->real_handler && p->packer_vprintf);
+    p->packer_vprintf(p->real_handler, fmt, args);
     va_end(args);
 }

diff --git a/src/structs.h b/src/structs.h
index e3a4d759ab5cd68bffacfb2c1e2c8268654052c7..990a479645f35075273593824e6341c362e97cbb 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: structs.h,v 1.525 2005/09/03 11:53:32 serassio Exp $
+ * $Id: structs.h,v 1.526 2005/09/03 13:46:46 serassio Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -851,7 +851,7 @@ struct _Packer
 {
     /* protected, use interface functions instead */
     append_f append;
-    vprintf_f vprintf;
+    vprintf_f packer_vprintf;
     void *real_handler;                /* first parameter to real append and vprintf */
 };