X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fstring.h;h=5dd7d8dd7b0cdde0ef595f9ac13603d82713d6d9;hb=3dee67d04099cc5e2986ed94aa612f429f54d6fb;hp=ef567874248a8b47c408648818f8f7398e99f888;hpb=ba24508f51eed2af4f0192589801db2f945eac7b;p=awesomized%2Flibmemcached diff --git a/libmemcached/string.h b/libmemcached/string.h index ef567874..5dd7d8dd 100644 --- a/libmemcached/string.h +++ b/libmemcached/string.h @@ -9,6 +9,7 @@ * */ +#pragma once #ifndef __LIBMEMCACHED_STRING_H__ #define __LIBMEMCACHED_STRING_H__ @@ -28,11 +29,16 @@ struct memcached_string_st { size_t current_size; const memcached_st *root; struct { - bool is_allocated MEMCACHED_BITFIELD; - bool is_initialized MEMCACHED_BITFIELD; + bool is_allocated:1; + bool is_initialized:1; } options; }; +struct memcached_string_t { + size_t size; + const char *c_str; +}; + #ifdef __cplusplus extern "C" { #endif @@ -74,9 +80,18 @@ char *memcached_string_value_mutable(const memcached_string_st *self); LIBMEMCACHED_LOCAL void memcached_string_set_length(memcached_string_st *self, size_t length); +LIBMEMCACHED_LOCAL +memcached_string_t memcached_string_make(const char *str, size_t length); + #ifdef __cplusplus } #endif +#ifdef __cplusplus +#define memcached_string_with_size(X) (X), (static_cast((sizeof(X) - 1))) +#else +#define memcached_string_with_size(X) (X), ((size_t)((sizeof(X) - 1))) +#endif + #endif /* __LIBMEMCACHED_STRING_H__ */