From 026636b0cd4baf5ff90b607118b6b4394edcdd05 Mon Sep 17 00:00:00 2001
From: Pieter Noordhuis <pcnoordhuis@gmail.com>
Date: Thu, 21 Apr 2011 14:27:03 +0200
Subject: Remove accessor functions now the redisReader struct is public

---
 hiredis.c | 14 --------------
 hiredis.h |  6 ++++--
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/hiredis.c b/hiredis.c
index 8b121f1..efe2543 100644
--- a/hiredis.c
+++ b/hiredis.c
@@ -559,15 +559,6 @@ int redisReplyReaderSetPrivdata(redisReader *reader, void *privdata) {
     return REDIS_ERR;
 }
 
-/* External libraries wrapping hiredis might need access to the temporary
- * variable while the reply is built up. When the reader contains an
- * object in between receiving some bytes to parse, this object might
- * otherwise be free'd by garbage collection. */
-void *redisReplyReaderGetObject(redisReader *reader) {
-    redisReader *r = reader;
-    return r->reply;
-}
-
 void redisReplyReaderFree(redisReader *reader) {
     redisReader *r = reader;
     if (r->reply != NULL && r->fn && r->fn->freeObject)
@@ -577,11 +568,6 @@ void redisReplyReaderFree(redisReader *reader) {
     free(r);
 }
 
-char *redisReplyReaderGetError(redisReader *reader) {
-    redisReader *r = reader;
-    return r->errstr;
-}
-
 void redisReplyReaderFeed(redisReader *reader, const char *buf, size_t len) {
     redisReader *r = reader;
 
diff --git a/hiredis.h b/hiredis.h
index 514025b..55311ba 100644
--- a/hiredis.h
+++ b/hiredis.h
@@ -135,12 +135,14 @@ void freeReplyObject(void *reply);
 redisReader *redisReplyReaderCreate(void);
 int redisReplyReaderSetReplyObjectFunctions(redisReader *reader, redisReplyObjectFunctions *fn);
 int redisReplyReaderSetPrivdata(redisReader *reader, void *privdata);
-void *redisReplyReaderGetObject(redisReader *reader);
-char *redisReplyReaderGetError(redisReader *reader);
 void redisReplyReaderFree(redisReader *ptr);
 void redisReplyReaderFeed(redisReader *reader, const char *buf, size_t len);
 int redisReplyReaderGetReply(redisReader *reader, void **reply);
 
+/* Backwards compatibility, can be removed on big version bump. */
+#define redisReplyReaderGetObject(_r) (((redisReader*)(r))->reply)
+#define redisReplyReaderGetError(_r) (((redisReader*)(r))->errstr)
+
 /* Functions to format a command according to the protocol. */
 int redisvFormatCommand(char **target, const char *format, va_list ap);
 int redisFormatCommand(char **target, const char *format, ...);
-- 
cgit v1.2.3