*
*/
-#ifndef __MEMCACHED_STRING_H__
-#define __MEMCACHED_STRING_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#pragma once
+#ifndef __LIBMEMCACHED_STRING_H__
+#define __LIBMEMCACHED_STRING_H__
/**
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
+ 2) A string once intialized will always be, until free where we
unset this flag.
3) A string always has a root.
*/
char *end;
char *string;
size_t current_size;
- const memcached_st *root;
+ memcached_st *root;
struct {
bool is_allocated:1;
bool is_initialized:1;
} options;
};
-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;
-}
+struct memcached_string_t {
+ size_t size;
+ const char *c_str;
+};
-#define memcached_string_set_length(A, B) (A)->end= (A)->string + B
+#ifdef __cplusplus
+extern "C" {
+#endif
LIBMEMCACHED_LOCAL
memcached_string_st *memcached_string_create(const memcached_st *ptr,
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__ */