- fixed type-casting warning for debugObj()

diff --git a/src/internal.cc b/src/internal.cc
index ebafb462fbe3df48dd05214a01b5ba3c63bd5d63..23793532c93b0b7a7d8eaf49de89704a8a4df78d 100644 (file)
--- a/src/internal.cc
+++ b/src/internal.cc
@@ -16,7 +16,7 @@ internalStart(request_t * request, StoreEntry * entry)
        netdbBinaryExchange(entry);
     else {
        debug(0, 0) ("internalStart: unknown request '%s'\n", upath);
-       debugObj(0,0, request, &httpRequestPack);
+       debugObj(0,0, request, (ObjPackMethod)&httpRequestPack);
        err = errorCon(ERR_INVALID_REQ, HTTP_NOT_FOUND);
        err->request = requestLink(request);
        errorAppendEntry(entry, err);

diff --git a/src/protos.h b/src/protos.h
index 66a6549be7ffe550cbcd1f78e8a5ea2c1d2b25f2..42fa9116543107e8a568eb2a213a2df80befa872 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -1017,7 +1017,7 @@ extern peer * carpSelectParent(request_t *);
 #endif
 
 /* packs, then prints an object using debug() */
-extern void debugObj(int section, int level, void *obj, void (*packMeth)(void *obj, Packer *p));
+extern void debugObj(int section, int level, void *obj, ObjPackMethod pm);
 
 /*
  * prototypes for system functions missing from system includes

diff --git a/src/tools.cc b/src/tools.cc
index e3f853b8b24e81bff8cac6bceeed7cd7ebf49f12..58e5f2300f3dabddf5b7d0f457ea16e015561912 100644 (file)
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: tools.cc,v 1.159 1998/07/17 04:50:01 rousskov Exp $
+ * $Id: tools.cc,v 1.160 1998/07/17 04:57:21 rousskov Exp $
  *
  * DEBUG: section 21    Misc Functions
  * AUTHOR: Harvest Derived
@@ -897,14 +897,14 @@ gb_to_str(const gb_t * g)
 }
 
 void
-debugObj(int section, int level, void *obj, void (*packMeth)(void *obj, Packer *p))
+debugObj(int section, int level, void *obj, ObjPackMethod pm)
 {
     MemBuf mb;
     Packer p;
     assert(obj);
     memBufDefInit(&mb);
     packerToMemInit(&p, &mb);
-    (*packMeth)(obj, &p);
+    (*pm)(obj, &p);
     debug(section, level) ("%s", mb.buf);
     packerClean(&p);
     memBufClean(&mb);

diff --git a/src/typedefs.h b/src/typedefs.h
index 819fdd0c9a6ae3d3cf9be548d2b1393015ccbc76..80ca44d48c048f3ee267d966ef6bd7ffce59a4af 100644 (file)
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -190,3 +190,6 @@ typedef ssize_t HttpHeaderPos;
 
 /* big mask for http headers */
 typedef char HttpHeaderMask[8];
+
+/* a common objPackInto interface; used by debugObj */
+typedef void (*ObjPackMethod)(void *obj, Packer *p);