Merge in all of build.

[m6w6/libmemcached] / libmemcached / string.h

diff --git a/libmemcached/string.h b/libmemcached/string.h
index 9a9872645110ecb6112441eaa7b0b3a6a31f914a..ca3dad14faa64e2601c652b1f98b624a26df69b6 100644 (file)
--- a/libmemcached/string.h
+++ b/libmemcached/string.h
@@ -9,32 +9,42 @@
  *
  */
 
-#ifndef __MEMCACHED_STRING_H__
-#define __MEMCACHED_STRING_H__
+#pragma once
+#ifndef __LIBMEMCACHED_STRING_H__
+#define __LIBMEMCACHED_STRING_H__
 
-#ifdef __cplusplus
-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;
+  memcached_st *root;
   struct {
     bool is_allocated:1;
     bool is_initialized:1;
   } options;
 };
 
-#define memcached_string_length(A) (size_t)((A)->end - (A)->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
+struct memcached_string_t {
+  size_t size;
+  const char *c_str;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 LIBMEMCACHED_LOCAL
-memcached_string_st *memcached_string_create(memcached_st *ptr,
+memcached_string_st *memcached_string_create(const memcached_st *ptr,
                                              memcached_string_st *string,
                                              size_t initial_size);
 LIBMEMCACHED_LOCAL
@@ -55,8 +65,37 @@ memcached_return_t memcached_string_reset(memcached_string_st *string);
 LIBMEMCACHED_LOCAL
 void memcached_string_free(memcached_string_st *string);
 
+LIBMEMCACHED_LOCAL
+size_t memcached_string_length(const memcached_string_st *self);
+
+LIBMEMCACHED_LOCAL
+size_t memcached_string_size(const memcached_string_st *self);
+
+LIBMEMCACHED_LOCAL
+const char *memcached_string_value(const memcached_string_st *self);
+
+LIBMEMCACHED_LOCAL
+char *memcached_string_value_mutable(const memcached_string_st *self);
+
+LIBMEMCACHED_LOCAL
+void memcached_string_set_length(memcached_string_st *self, size_t length);
+
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* __MEMCACHED_STRING_H__ */
+#ifdef BUILDING_LIBMEMCACHED
+
+#ifdef __cplusplus
+#define memcached_string_with_size(X) (X), (static_cast<size_t>((sizeof(X) - 1)))
+#define memcached_string_make(X) (static_cast<size_t>((sizeof(X) - 1))), (X)
+#else
+#define memcached_string_with_size(X) (X), ((size_t)((sizeof(X) - 1)))
+#define memcached_string_make(X) (((size_t)((sizeof(X) - 1))), (X)
+#endif
+
+#define memcached_string_make_from_cstr(X) (X), ((X) ? strlen(X) : 0)
+
+#endif
+
+#endif /* __LIBMEMCACHED_STRING_H__ */