From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 16 Sep 2010 11:27:19 +0000 (+1200)
Subject: Use ptrdiff_t instead of int for mem_node data offset
X-Git-Tag: take1~258
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=92047e4657418de4df6b634f3e9b0f5c18dcff91;p=thirdparty%2Fsquid.git

Use ptrdiff_t instead of int for mem_node data offset

This is the correct POSIX type for storing pointer offsets.

TODO: The store API use of mem_node needs some design fixes to obsolete
      these offsets entirely.
---

diff --git a/src/mem_node.cc b/src/mem_node.cc
index 854c7f06a1..9f17a09e94 100644
--- a/src/mem_node.cc
+++ b/src/mem_node.cc
@@ -36,19 +36,19 @@
 #include "squid.h"
 #include "mem_node.h"
 
-static int makeMemNodeDataOffset();
+static ptrdiff_t makeMemNodeDataOffset();
 
-static int _mem_node_data_offset = makeMemNodeDataOffset();
+static ptrdiff_t _mem_node_data_offset = makeMemNodeDataOffset();
 
 /*
  * Calculate the offset between the start of a mem_node and
  * its 'data' member
  */
-static int
+static ptrdiff_t
 makeMemNodeDataOffset()
 {
     mem_node *p = 0L;
-    return int(ptrdiff_t(&p->data));
+    return &p->data;
 }
 
 /*