Merge branch '2.2' into develop

include/maxscale/buffer.h

@@ -363,16 +363,13 @@ extern char *gwbuf_get_property(GWBUF *buf, const char *name);
 /**
  * Convert a chain of GWBUF structures into a single GWBUF structure
  *
- * @param orig  The chain to convert
+ * @param orig  The chain to convert, must not be used after the function call
  *
- * @return NULL if @c buf is NULL or if a memory allocation fails,
- *         @c buf if @c buf already is contiguous, and otherwise
- *         a contigious copy of @c buf.
+ * @return A contiguous version of @c buf.
  *
- * @attention If a non-NULL value is returned, the @c buf should no
- *            longer be used as it may have been freed.
+ * @attention Never returns NULL, memory allocation failures abort the process
  */
-extern GWBUF *gwbuf_make_contiguous(GWBUF *buf);
+extern GWBUF* gwbuf_make_contiguous(GWBUF *buf);
 
 /**
  * Add a buffer object to GWBUF buffer.
@@ -401,11 +398,12 @@ extern void dprintAllBuffers(void *pdcb);
 #endif
 
 /**
- * Debug function for dumping buffer contents to INFO log
+ * Debug function for dumping buffer contents to log
  *
- * @param buffer Buffer to dump
+ * @param buffer    Buffer to dump
+ * @param log_level Log priority where the message is written
  */
-void gwbuf_hexdump(GWBUF* buffer);
+void gwbuf_hexdump(GWBUF* buffer, int log_level);
 
 /**
  * Return pointer of the byte at offset from start of chained buffer