X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fstring.h;h=168172ea70e5c489c8168d90abd2247ae2594c83;hb=284978b1dc258cb8cd2a32d6a0f25f2f9b284149;hp=4fc67cfcee859e561f773297ea800041f737a9cb;hpb=720028f73260fa1ff8a1d49c8572de04deadea57;p=m6w6%2Flibmemcached

diff --git a/libmemcached/string.h b/libmemcached/string.h
index 4fc67cfc..168172ea 100644
--- a/libmemcached/string.h
+++ b/libmemcached/string.h
@@ -9,12 +9,8 @@
  *
  */
 
-#ifndef __MEMCACHED_STRING_H__
-#define __MEMCACHED_STRING_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef __LIBMEMCACHED_STRING_H__
+#define __LIBMEMCACHED_STRING_H__
 
 /**
   Strings are always under our control so we make some assumptions
@@ -37,13 +33,12 @@ struct memcached_string_st {
   } 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
+#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
@@ -64,8 +59,31 @@ memcached_return_t memcached_string_reset(memcached_string_st *string);
 LIBMEMCACHED_LOCAL
 void memcached_string_free(memcached_string_st *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
+
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* __MEMCACHED_STRING_H__ */
+
+#endif /* __LIBMEMCACHED_STRING_H__ */