Merge branch '2.2' into develop

2018-06-01 09:33:04 +03:00
parent c039821467 89296ed4e4
commit 5d02d8c0ba
9 changed files with 86 additions and 59 deletions
--- a/server/core/buffer.cc
+++ b/server/core/buffer.cc
@ -813,28 +813,6 @@ gwbuf_make_contiguous(GWBUF *orig)
    return newbuf;
 }

-void
-gwbuf_add_hint(GWBUF *buf, HINT *hint)
-{
-    HINT *ptr;
-
-    spinlock_acquire(&buf->gwbuf_lock);
-    if (buf->hint)
-    {
-        ptr = buf->hint;
-        while (ptr->next)
-        {
-            ptr = ptr->next;
-        }
-        ptr->next = hint;
-    }
-    else
-    {
-        buf->hint = hint;
-    }
-    spinlock_release(&buf->gwbuf_lock);
-}
-
 size_t gwbuf_copy_data(const GWBUF *buffer, size_t offset, size_t bytes, uint8_t* dest)
 {
    uint32_t buflen;