From ab5abf6c7ec7668c4a8373d87c491d22d0db144d Mon Sep 17 00:00:00 2001
From: Martin Sustrik <sustrik@fastmq.commkdir>
Date: Wed, 16 Dec 2009 15:08:37 +0100
Subject: hint parameter added to zmq_free function

---
 src/msg_content.hpp | 1 +
 src/zmq.cpp         | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/msg_content.hpp b/src/msg_content.hpp
index 22dd915..cb217b7 100644
--- a/src/msg_content.hpp
+++ b/src/msg_content.hpp
@@ -42,6 +42,7 @@ namespace zmq
         void *data;
         size_t size;
         zmq_free_fn *ffn;
+        void *hint;
         zmq::atomic_counter_t refcnt;
     };
 
diff --git a/src/zmq.cpp b/src/zmq.cpp
index d523036..cce07af 100644
--- a/src/zmq.cpp
+++ b/src/zmq.cpp
@@ -103,13 +103,14 @@ int zmq_msg_init_size (zmq_msg_t *msg_, size_t size_)
         content->data = (void*) (content + 1);
         content->size = size_;
         content->ffn = NULL;
+        content->hint = NULL;
         new (&content->refcnt) zmq::atomic_counter_t ();
     }
     return 0;
 }
 
 int zmq_msg_init_data (zmq_msg_t *msg_, void *data_, size_t size_,
-    zmq_free_fn *ffn_)
+    zmq_free_fn *ffn_, void *hint_)
 {
     msg_->shared = 0;
     msg_->content = (zmq::msg_content_t*) malloc (sizeof (zmq::msg_content_t));
@@ -118,6 +119,7 @@ int zmq_msg_init_data (zmq_msg_t *msg_, void *data_, size_t size_,
     content->data = data_;
     content->size = size_;
     content->ffn = ffn_;
+    content->hint = hint_;
     new (&content->refcnt) zmq::atomic_counter_t ();
     return 0;
 }
@@ -139,7 +141,7 @@ int zmq_msg_close (zmq_msg_t *msg_)
         content->refcnt.~atomic_counter_t ();
 
         if (content->ffn)
-            content->ffn (content->data);
+            content->ffn (content->data, content->hint);
         free (content);
     }
 
-- 
cgit v1.2.3