@@ -179,14 +179,6 @@ buf_assign(struct buffer *dest, const struct buffer *src)

     return buf_write(dest, BPTR(src), BLEN(src));

 }

-struct buffer

-clear_buf(void)

-{

-    struct buffer buf;

-    CLEAR(buf);

-    return buf;

-}

-

 void

 free_buf(struct buffer *buf)

 {

@@ -131,8 +131,6 @@ struct gc_arena

 void buf_clear(struct buffer *buf);

-struct buffer clear_buf(void);

-

 void free_buf(struct buffer *buf);

 bool buf_assign(struct buffer *dest, const struct buffer *src);

@@ -206,6 +204,13 @@ gc_freeaddrinfo_callback(void *addr)

     freeaddrinfo((struct addrinfo *) addr);

 }

+/** Return an empty struct buffer */

+static inline struct buffer

+clear_buf(void)

+{

+    return (struct buffer) { 0 };

+}

+

 static inline bool

 buf_defined(const struct buffer *buf)

 {