Small cleanup in string.h and converted result_st macro to inline.

[awesomized/libmemcached] / libmemcached / result.h

diff --git a/libmemcached/result.h b/libmemcached/result.h
index 4b0c12e51369cd4363529c65c14eee4bd2ca6833..c45ae202fd890a4c3317ff33429da26f138211c2 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
@@ -37,26 +37,55 @@ 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(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);
-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
-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)
+
+static inline const char *memcached_result_key_value(const memcached_result_st *self)
+{
+  return self->key;
+}
+
+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->flags;
+}
+
+static inline uint64_t memcached_result_cas(const memcached_result_st *self)
+{
+  return self->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->flags= flags;
+}
+
+static inline void memcached_result_set_expiration(memcached_result_st *self, uint32_t expiration)
+{
+  self->expiration= expiration;
+}
 
 #ifdef __cplusplus
 }