X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fresult.h;h=59ce9b91b1baba26a8cf096786781b0b945f3078;hb=f9f501287ffa6a2c69a9033536d3b6f14db34204;hp=c685984ab07b50a8b4c94a28a39b2280ac1a9060;hpb=7c986323bd4eece0d805f4df17eb03ea094f84f6;p=awesomized%2Flibmemcached

diff --git a/libmemcached/result.h b/libmemcached/result.h
index c685984a..59ce9b91 100644
--- a/libmemcached/result.h
+++ b/libmemcached/result.h
@@ -9,60 +9,69 @@
  *
  */
 
-#ifndef __MEMCACHED_RESULT_H__
-#define __MEMCACHED_RESULT_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef __LIBMEMCACHED_RESULT_H__
+#define __LIBMEMCACHED_RESULT_H__
 
 struct memcached_result_st {
-  struct {
-    bool is_allocated:1;
-    bool is_initialized:1;
-  } options;
-  uint32_t flags;
-  time_t expiration;
-  memcached_st *root;
+  uint32_t item_flags;
+  time_t item_expiration;
   size_t key_length;
-  uint64_t cas;
+  uint64_t item_cas;
+  const memcached_st *root;
   memcached_string_st value;
-  char key[MEMCACHED_MAX_KEY];
+  char item_key[MEMCACHED_MAX_KEY];
+  struct {
+    bool is_allocated MEMCACHED_BITFIELD;
+    bool is_initialized MEMCACHED_BITFIELD;
+  } options;
   /* Add result callback function */
 };
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Result Struct */
 LIBMEMCACHED_API
 void memcached_result_free(memcached_result_st *result);
+
 LIBMEMCACHED_API
 void memcached_result_reset(memcached_result_st *ptr);
+
 LIBMEMCACHED_API
-memcached_result_st *memcached_result_create(memcached_st *ptr,
+memcached_result_st *memcached_result_create(const memcached_st *ptr,
                                              memcached_result_st *result);
-#define memcached_result_key_value(A) (A)->key
-#define memcached_result_key_length(A) (A)->key_length
-#define memcached_result_string_st(A) ((A)->value)
-#ifdef FIX
-#define memcached_result_value(A) memcached_string_value((A)->value)
-#define memcached_result_length(A) memcached_string_length((A)->value)
-#else
 
 LIBMEMCACHED_API
-char *memcached_result_value(memcached_result_st *ptr);
+const char *memcached_result_key_value(const memcached_result_st *self);
 
 LIBMEMCACHED_API
-size_t memcached_result_length(memcached_result_st *ptr);
+size_t memcached_result_key_length(const memcached_result_st *self);
+
+LIBMEMCACHED_API
+const char *memcached_result_value(const memcached_result_st *self);
+
+LIBMEMCACHED_API
+size_t memcached_result_length(const memcached_result_st *self);
+
+LIBMEMCACHED_API
+uint32_t memcached_result_flags(const memcached_result_st *self);
+
+LIBMEMCACHED_API
+uint64_t memcached_result_cas(const memcached_result_st *self);
 
-#endif
-#define memcached_result_flags(A) (A)->flags
-#define memcached_result_cas(A) (A)->cas
 LIBMEMCACHED_API
 memcached_return_t memcached_result_set_value(memcached_result_st *ptr, const char *value, size_t length);
-#define memcached_result_set_flags(A,B) (A)->flags=(B)
-#define memcached_result_set_expiration(A,B) (A)->expiration=(B)
+
+LIBMEMCACHED_API
+void memcached_result_set_flags(memcached_result_st *self, uint32_t flags);
+
+LIBMEMCACHED_API
+void memcached_result_set_expiration(memcached_result_st *self, time_t expiration);
 
 #ifdef __cplusplus
-}
+} // extern "C"
 #endif
 
-#endif /* __MEMCACHED_RESULT_H__ */
+
+#endif /* __LIBMEMCACHED_RESULT_H__ */