Fixed alt/cstr.h (short string optimized), so that it can be used in containers. Had to change some API in csview to make it play with that.

1 files changed, 9 insertions, 1 deletions

diff --git a/include/stc/forward.h b/include/stc/forward.h
index bffdf154..ea552204 100644
--- a/include/stc/forward.h
+++ b/include/stc/forward.h
@@ -42,7 +42,15 @@
 #define forward_cqueue(CX, VAL) _c_cdeq_types(CX, VAL)

 #define forward_cvec(CX, VAL) _c_cvec_types(CX, VAL)

 

-typedef struct cstr { char* str; } cstr;

+#ifdef CSTR_IS_SSO

+typedef struct { char* data; size_t size, cap; } _cstr_rep_t;

+typedef union {

+    struct { char data[sizeof(_cstr_rep_t) - 1], cap_len; } sso;

+    struct { char* data; size_t size, ncap; } lon;

+} cstr;

+#else

+  typedef struct cstr { char* str; } cstr;

+#endif

 typedef char cstr_value;

 

 typedef struct csview { const char* str; size_t size; } csview;