Fix issue where hash might not be quite initialized. Also remove redundant bit to...

[awesomized/libmemcached] / libmemcached / result.h

diff --git a/libmemcached/result.h b/libmemcached/result.h
index 4b0c12e51369cd4363529c65c14eee4bd2ca6833..701b89b764c828046cc76154447a08893a2e0eab 100644 (file)
--- a/libmemcached/result.h
+++ b/libmemcached/result.h
@@ -1,5 +1,5 @@
 /* LibMemcached
- * Copyright (C) 2006-2009 Brian Aker 
+ * Copyright (C) 2006-2009 Brian Aker
  * All rights reserved.
  *
  * Use and distribution licensed under the BSD license.  See
@@ -9,57 +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 {
+  uint32_t item_flags;
+  time_t item_expiration;
+  size_t key_length;
+  uint64_t item_cas;
+  memcached_st *root;
+  memcached_string_st value;
+  char item_key[MEMCACHED_MAX_KEY];
   struct {
     bool is_allocated:1;
     bool is_initialized:1;
   } options;
-  uint32_t flags;
-  time_t expiration;
-  memcached_st *root;
-  size_t key_length;
-  uint64_t cas;
-  memcached_string_st value;
-  char key[MEMCACHED_MAX_KEY];
   /* 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);
-#endif
-#define memcached_result_flags(A) (A)->flags
-#define memcached_result_cas(A) (A)->cas
+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);
+
 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__ */