Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
hiredis
Commits
026636b0
Commit
026636b0
authored
Apr 21, 2011
by
Pieter Noordhuis
Browse files
Remove accessor functions now the redisReader struct is public
parent
f0307c61
Changes
2
Show whitespace changes
Inline
Side-by-side
hiredis.c
View file @
026636b0
...
@@ -559,15 +559,6 @@ int redisReplyReaderSetPrivdata(redisReader *reader, void *privdata) {
...
@@ -559,15 +559,6 @@ int redisReplyReaderSetPrivdata(redisReader *reader, void *privdata) {
return
REDIS_ERR
;
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
)
{
void
redisReplyReaderFree
(
redisReader
*
reader
)
{
redisReader
*
r
=
reader
;
redisReader
*
r
=
reader
;
if
(
r
->
reply
!=
NULL
&&
r
->
fn
&&
r
->
fn
->
freeObject
)
if
(
r
->
reply
!=
NULL
&&
r
->
fn
&&
r
->
fn
->
freeObject
)
...
@@ -577,11 +568,6 @@ void redisReplyReaderFree(redisReader *reader) {
...
@@ -577,11 +568,6 @@ void redisReplyReaderFree(redisReader *reader) {
free
(
r
);
free
(
r
);
}
}
char
*
redisReplyReaderGetError
(
redisReader
*
reader
)
{
redisReader
*
r
=
reader
;
return
r
->
errstr
;
}
void
redisReplyReaderFeed
(
redisReader
*
reader
,
const
char
*
buf
,
size_t
len
)
{
void
redisReplyReaderFeed
(
redisReader
*
reader
,
const
char
*
buf
,
size_t
len
)
{
redisReader
*
r
=
reader
;
redisReader
*
r
=
reader
;
...
...
hiredis.h
View file @
026636b0
...
@@ -135,12 +135,14 @@ void freeReplyObject(void *reply);
...
@@ -135,12 +135,14 @@ void freeReplyObject(void *reply);
redisReader
*
redisReplyReaderCreate
(
void
);
redisReader
*
redisReplyReaderCreate
(
void
);
int
redisReplyReaderSetReplyObjectFunctions
(
redisReader
*
reader
,
redisReplyObjectFunctions
*
fn
);
int
redisReplyReaderSetReplyObjectFunctions
(
redisReader
*
reader
,
redisReplyObjectFunctions
*
fn
);
int
redisReplyReaderSetPrivdata
(
redisReader
*
reader
,
void
*
privdata
);
int
redisReplyReaderSetPrivdata
(
redisReader
*
reader
,
void
*
privdata
);
void
*
redisReplyReaderGetObject
(
redisReader
*
reader
);
char
*
redisReplyReaderGetError
(
redisReader
*
reader
);
void
redisReplyReaderFree
(
redisReader
*
ptr
);
void
redisReplyReaderFree
(
redisReader
*
ptr
);
void
redisReplyReaderFeed
(
redisReader
*
reader
,
const
char
*
buf
,
size_t
len
);
void
redisReplyReaderFeed
(
redisReader
*
reader
,
const
char
*
buf
,
size_t
len
);
int
redisReplyReaderGetReply
(
redisReader
*
reader
,
void
**
reply
);
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. */
/* Functions to format a command according to the protocol. */
int
redisvFormatCommand
(
char
**
target
,
const
char
*
format
,
va_list
ap
);
int
redisvFormatCommand
(
char
**
target
,
const
char
*
format
,
va_list
ap
);
int
redisFormatCommand
(
char
**
target
,
const
char
*
format
,
...);
int
redisFormatCommand
(
char
**
target
,
const
char
*
format
,
...);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment