X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fstring.h;h=9e064d9ad117808475c6b7f692907101e841e6b2;hb=98d4dea6ae8869b6fe5e37a2908d66ff062b8f39;hp=d93bc0d23ab27c5e70d29ad911aa1b7499bf26c8;hpb=7c7750f02368b570353ea109f23a0ea26d226e02;p=awesomized%2Flibmemcached

diff --git a/libmemcached/string.h b/libmemcached/string.h
index d93bc0d2..9e064d9a 100644
--- a/libmemcached/string.h
+++ b/libmemcached/string.h
@@ -16,43 +16,69 @@
 extern "C" {
 #endif
 
+/**
+  Strings are always under our control so we make some assumptions
+  about them.
+
+  1) is_initialized is always valid.
+  2) A string once intialized will always be, until free where we 
+     unset this flag.
+  3) A string always has a root.
+*/
+
 struct memcached_string_st {
-  memcached_st *root;
   char *end;
   char *string;
   size_t current_size;
-  size_t block_size;
+  const memcached_st *root;
   struct {
     bool is_allocated:1;
     bool is_initialized:1;
   } options;
 };
 
-#define memcached_string_length(A) (size_t)((A)->end - (A)->string)
+static inline size_t memcached_string_length(const memcached_string_st *self)
+{
+  return (size_t)(self->end - self->string);
+}
+
+static inline size_t memcached_string_size(const memcached_string_st *self)
+{
+  return self->current_size;
+}
+
+static inline const char *memcached_string_value(const memcached_string_st *self)
+{
+  return self->string;
+}
+
+static inline char *memcached_string_value_mutable(const memcached_string_st *self)
+{
+  return self->string;
+}
+
 #define memcached_string_set_length(A, B) (A)->end= (A)->string + B
-#define memcached_string_size(A) (A)->current_size
-#define memcached_string_value(A) (A)->string
 
-LIBMEMCACHED_API
-memcached_string_st *memcached_string_create(memcached_st *ptr,
+LIBMEMCACHED_LOCAL
+memcached_string_st *memcached_string_create(const memcached_st *ptr,
                                              memcached_string_st *string,
                                              size_t initial_size);
-LIBMEMCACHED_API
+LIBMEMCACHED_LOCAL
 memcached_return_t memcached_string_check(memcached_string_st *string, size_t need);
 
-LIBMEMCACHED_API
+LIBMEMCACHED_LOCAL
 char *memcached_string_c_copy(memcached_string_st *string);
 
-LIBMEMCACHED_API
+LIBMEMCACHED_LOCAL
 memcached_return_t memcached_string_append_character(memcached_string_st *string,
                                                      char character);
-LIBMEMCACHED_API
+LIBMEMCACHED_LOCAL
 memcached_return_t memcached_string_append(memcached_string_st *string,
                                            const char *value, size_t length);
-LIBMEMCACHED_API
+LIBMEMCACHED_LOCAL
 memcached_return_t memcached_string_reset(memcached_string_st *string);
 
-LIBMEMCACHED_API
+LIBMEMCACHED_LOCAL
 void memcached_string_free(memcached_string_st *string);
 
 #ifdef __cplusplus