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 f01550e721e123a8e6f17924ede897b480c6a57e..701b89b764c828046cc76154447a08893a2e0eab 100644 (file)
--- a/libmemcached/result.h
+++ b/libmemcached/result.h
@@ -9,19 +9,15 @@
  *
  */
 
-#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;
-  const memcached_st *root;
+  memcached_st *root;
   memcached_string_st value;
   char item_key[MEMCACHED_MAX_KEY];
   struct {
@@ -31,6 +27,10 @@ struct memcached_result_st {
   /* Add result callback function */
 };
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Result Struct */
 LIBMEMCACHED_API
 void memcached_result_free(memcached_result_st *result);
@@ -42,55 +42,36 @@ LIBMEMCACHED_API
 memcached_result_st *memcached_result_create(const memcached_st *ptr,
                                              memcached_result_st *result);
 
-static inline const char *memcached_result_key_value(const memcached_result_st *self)
-{
-  return self->key_length ? self->item_key : NULL;
-}
-
-static inline size_t memcached_result_key_length(const memcached_result_st *self)
-{
-  return self->key_length;
-}
-
-static inline const char *memcached_result_value(const memcached_result_st *self)
-{
-  const memcached_string_st *sptr= &self->value;
-  return memcached_string_value(sptr);
-}
-
-static inline size_t memcached_result_length(const memcached_result_st *self)
-{
-  const memcached_string_st *sptr= &self->value;
-  return memcached_string_length(sptr);
-}
-
-static inline uint32_t memcached_result_flags(const memcached_result_st *self)
-{
-  return self->item_flags;
-}
-
-static inline uint64_t memcached_result_cas(const memcached_result_st *self)
-{
-  return self->item_cas;
-}
-
-static inline memcached_return_t memcached_result_set_value(memcached_result_st *ptr, const char *value, size_t length)
-{
-  return memcached_string_append(&ptr->value, value, length);
-}
-
-static inline void memcached_result_set_flags(memcached_result_st *self, uint32_t flags)
-{
-  self->item_flags= flags;
-}
-
-static inline void memcached_result_set_expiration(memcached_result_st *self, time_t expiration)
-{
-  self->item_expiration= expiration;
-}
+LIBMEMCACHED_API
+const char *memcached_result_key_value(const memcached_result_st *self);
+
+LIBMEMCACHED_API
+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);
+
+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__ */