projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in code changes for all of the new parser.
[awesomized/libmemcached]
/
libmemcached
/
string.h
diff --git
a/libmemcached/string.h
b/libmemcached/string.h
index 605ac57ba4c7e664e215f5e2c81082f24f7a32f4..5dd7d8dd7b0cdde0ef595f9ac13603d82713d6d9 100644
(file)
--- a/
libmemcached/string.h
+++ b/
libmemcached/string.h
@@
-9,6
+9,7
@@
*
*/
*
*/
+#pragma once
#ifndef __LIBMEMCACHED_STRING_H__
#define __LIBMEMCACHED_STRING_H__
#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 {
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;
};
} options;
};
+struct memcached_string_t {
+ size_t size;
+ const char *c_str;
+};
+
#ifdef __cplusplus
extern "C" {
#endif
#ifdef __cplusplus
extern "C" {
#endif
@@
-59,31
+65,33
@@
memcached_return_t memcached_string_reset(memcached_string_st *string);
LIBMEMCACHED_LOCAL
void memcached_string_free(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);
-}
+LIBMEMCACHED_LOCAL
+size_t memcached_string_length(const memcached_string_st *self);
-static inline size_t memcached_string_size(const memcached_string_st *self)
-{
- return self->current_size;
-}
+LIBMEMCACHED_LOCAL
+size_t memcached_string_size(const memcached_string_st *self);
-static inline const char *memcached_string_value(const memcached_string_st *self)
-{
- return self->string;
-}
+LIBMEMCACHED_LOCAL
+const char *memcached_string_value(const memcached_string_st *self);
-static inline char *memcached_string_value_mutable(const memcached_string_st *self)
-{
- return self->string;
-}
+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);
-#define memcached_string_set_length(A, B) (A)->end= (A)->string + B
+LIBMEMCACHED_LOCAL
+memcached_string_t memcached_string_make(const char *str, size_t length);
#ifdef __cplusplus
}
#endif
#ifdef __cplusplus
}
#endif
+#ifdef __cplusplus
+#define memcached_string_with_size(X) (X), (static_cast<size_t>((sizeof(X) - 1)))
+#else
+#define memcached_string_with_size(X) (X), ((size_t)((sizeof(X) - 1)))
+#endif
+
#endif /* __LIBMEMCACHED_STRING_H__ */
#endif /* __LIBMEMCACHED_STRING_H__ */