summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2014-11-14 15:48:47 -0800
committerJohn MacFarlane <jgm@berkeley.edu>2014-11-14 15:48:47 -0800
commitf2c2f626292ac83519bc478271b5678efcf67586 (patch)
tree0ca124087411d18d1666788679a4e6ea3514023a
parent38710f1de71e9bb22b3c602dd05fb558092e1fb1 (diff)
Moved code from buffer.h to buffer.c. Make strbuf_cstr static.
-rw-r--r--src/buffer.c20
-rw-r--r--src/buffer.h21
2 files changed, 23 insertions, 18 deletions
diff --git a/src/buffer.c b/src/buffer.c
index 6176da5..6219935 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -79,6 +79,21 @@ int cmark_strbuf_try_grow(strbuf *buf, int target_size, bool mark_oom)
return 0;
}
+int cmark_strbuf_grow(cmark_strbuf *buf, int target_size)
+{
+ return cmark_strbuf_try_grow(buf, target_size, true);
+}
+
+bool cmark_strbuf_oom(const cmark_strbuf *buf)
+{
+ return (buf->ptr == cmark_strbuf__oom);
+}
+
+size_t cmark_strbuf_len(const cmark_strbuf *buf)
+{
+ return buf->size;
+}
+
void cmark_strbuf_free(strbuf *buf)
{
if (!buf) return;
@@ -190,6 +205,11 @@ int cmark_strbuf_printf(strbuf *buf, const char *format, ...)
return r;
}
+static inline const char *cmark_strbuf_cstr(const cmark_strbuf *buf)
+{
+ return (char *)buf->ptr;
+}
+
void cmark_strbuf_copy_cstr(char *data, int datasize, const strbuf *buf)
{
int copylen;
diff --git a/src/buffer.h b/src/buffer.h
index 40e3d11..fc0a6c2 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -49,10 +49,7 @@ int cmark_strbuf_try_grow(cmark_strbuf *buf, int target_size, bool mark_oom);
* @return 0 on success or -1 on failure
*/
CMARK_EXPORT
-inline int cmark_strbuf_grow(cmark_strbuf *buf, int target_size)
-{
- return cmark_strbuf_try_grow(buf, target_size, true);
-}
+int cmark_strbuf_grow(cmark_strbuf *buf, int target_size);
CMARK_EXPORT
void cmark_strbuf_free(cmark_strbuf *buf);
@@ -71,16 +68,10 @@ void cmark_strbuf_swap(cmark_strbuf *buf_a, cmark_strbuf *buf_b);
* @return false if no error, true if allocation error
*/
CMARK_EXPORT
-inline bool cmark_strbuf_oom(const cmark_strbuf *buf)
-{
- return (buf->ptr == cmark_strbuf__oom);
-}
+bool cmark_strbuf_oom(const cmark_strbuf *buf);
CMARK_EXPORT
-inline size_t cmark_strbuf_len(const cmark_strbuf *buf)
-{
- return buf->size;
-}
+size_t cmark_strbuf_len(const cmark_strbuf *buf);
CMARK_EXPORT
int cmark_strbuf_cmp(const cmark_strbuf *a, const cmark_strbuf *b);
@@ -92,11 +83,6 @@ unsigned char *cmark_strbuf_detach(cmark_strbuf *buf);
CMARK_EXPORT
void cmark_strbuf_copy_cstr(char *data, int datasize, const cmark_strbuf *buf);
-static inline const char *cmark_strbuf_cstr(const cmark_strbuf *buf)
-{
- return (char *)buf->ptr;
-}
-
#define cmark_strbuf_at(buf, n) ((buf)->ptr[n])
/*
@@ -158,7 +144,6 @@ void cmark_strbuf_unescape(cmark_strbuf *s);
#define strbuf_attach cmark_strbuf_attach
#define strbuf_detach cmark_strbuf_detach
#define strbuf_copy_cstr cmark_strbuf_copy_cstr
- #define strbuf_cstr cmark_strbuf_cstr
#define strbuf_at cmark_strbuf_at
#define strbuf_set cmark_strbuf_set
#define strbuf_sets cmark_strbuf_sets