From: Joe Stringer <joe@ovn.org>
Date: Thu, 3 Mar 2016 08:22:51 +0000 (+1300)
Subject: ofpbuf: Use ptrdiff_t for pointer delta.
X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Fovs.git;a=commitdiff_plain;h=c391558c30d7d7eb5c20da3ba0cd4700b6890962

ofpbuf: Use ptrdiff_t for pointer delta.

Signed-off-by: Joe Stringer <joe@ovn.org>
Acked-by: Jarno Rajahalme <jarno@ovn.org>
---

diff --git a/lib/ofpbuf.c b/lib/ofpbuf.c
index a3c4da4bc..02c9d15f8 100644
--- a/lib/ofpbuf.c
+++ b/lib/ofpbuf.c
@@ -183,8 +183,7 @@ ofpbuf_clone_with_headroom(const struct ofpbuf *buffer, size_t headroom)
                                                  buffer->size,
                                                  headroom);
     if (buffer->header) {
-        uintptr_t data_delta
-            = (char *)new_buffer->data - (char *)buffer->data;
+        ptrdiff_t data_delta = (char *)new_buffer->data - (char *)buffer->data;
 
         new_buffer->header = (char *) buffer->header + data_delta;
     }
@@ -267,12 +266,12 @@ ofpbuf_resize__(struct ofpbuf *b, size_t new_headroom, size_t new_tailroom)
     new_data = (char *) new_base + new_headroom;
     if (b->data != new_data) {
         if (b->header) {
-            uintptr_t data_delta = (char *) b->header - (char *) b->data;
+            ptrdiff_t data_delta = (char *) b->header - (char *) b->data;
 
             b->header = (char *) new_data + data_delta;
         }
         if (b->msg) {
-            uintptr_t data_delta = (char *) b->msg - (char *) b->data;
+            ptrdiff_t data_delta = (char *) b->msg - (char *) b->data;
 
             b->msg = (char *) new_data + data_delta;
         }