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
20022189
Commit
20022189
authored
Apr 21, 2011
by
Pieter Noordhuis
Browse files
Remove useless casts
parent
e1abacb7
Changes
2
Hide whitespace changes
Inline
Side-by-side
hiredis.c
View file @
20022189
...
@@ -544,8 +544,7 @@ redisReader *redisReplyReaderCreate(void) {
...
@@ -544,8 +544,7 @@ redisReader *redisReplyReaderCreate(void) {
/* Set the function set to build the reply. Returns REDIS_OK when there
/* Set the function set to build the reply. Returns REDIS_OK when there
* is no temporary object and it can be set, REDIS_ERR otherwise. */
* is no temporary object and it can be set, REDIS_ERR otherwise. */
int
redisReplyReaderSetReplyObjectFunctions
(
redisReader
*
reader
,
redisReplyObjectFunctions
*
fn
)
{
int
redisReplyReaderSetReplyObjectFunctions
(
redisReader
*
r
,
redisReplyObjectFunctions
*
fn
)
{
redisReader
*
r
=
reader
;
if
(
r
->
reply
==
NULL
)
{
if
(
r
->
reply
==
NULL
)
{
r
->
fn
=
fn
;
r
->
fn
=
fn
;
return
REDIS_OK
;
return
REDIS_OK
;
...
@@ -555,8 +554,7 @@ int redisReplyReaderSetReplyObjectFunctions(redisReader *reader, redisReplyObjec
...
@@ -555,8 +554,7 @@ int redisReplyReaderSetReplyObjectFunctions(redisReader *reader, redisReplyObjec
/* Set the private data field that is used in the read tasks. This argument can
/* Set the private data field that is used in the read tasks. This argument can
* be used to curry arbitrary data to the custom reply object functions. */
* be used to curry arbitrary data to the custom reply object functions. */
int
redisReplyReaderSetPrivdata
(
redisReader
*
reader
,
void
*
privdata
)
{
int
redisReplyReaderSetPrivdata
(
redisReader
*
r
,
void
*
privdata
)
{
redisReader
*
r
=
reader
;
if
(
r
->
reply
==
NULL
)
{
if
(
r
->
reply
==
NULL
)
{
r
->
privdata
=
privdata
;
r
->
privdata
=
privdata
;
return
REDIS_OK
;
return
REDIS_OK
;
...
@@ -564,8 +562,7 @@ int redisReplyReaderSetPrivdata(redisReader *reader, void *privdata) {
...
@@ -564,8 +562,7 @@ int redisReplyReaderSetPrivdata(redisReader *reader, void *privdata) {
return
REDIS_ERR
;
return
REDIS_ERR
;
}
}
void
redisReplyReaderFree
(
redisReader
*
reader
)
{
void
redisReplyReaderFree
(
redisReader
*
r
)
{
redisReader
*
r
=
reader
;
if
(
r
->
reply
!=
NULL
&&
r
->
fn
&&
r
->
fn
->
freeObject
)
if
(
r
->
reply
!=
NULL
&&
r
->
fn
&&
r
->
fn
->
freeObject
)
r
->
fn
->
freeObject
(
r
->
reply
);
r
->
fn
->
freeObject
(
r
->
reply
);
if
(
r
->
buf
!=
NULL
)
if
(
r
->
buf
!=
NULL
)
...
@@ -573,9 +570,7 @@ void redisReplyReaderFree(redisReader *reader) {
...
@@ -573,9 +570,7 @@ void redisReplyReaderFree(redisReader *reader) {
free
(
r
);
free
(
r
);
}
}
void
redisReplyReaderFeed
(
redisReader
*
reader
,
const
char
*
buf
,
size_t
len
)
{
void
redisReplyReaderFeed
(
redisReader
*
r
,
const
char
*
buf
,
size_t
len
)
{
redisReader
*
r
=
reader
;
/* Copy the provided buffer. */
/* Copy the provided buffer. */
if
(
buf
!=
NULL
&&
len
>=
1
)
{
if
(
buf
!=
NULL
&&
len
>=
1
)
{
/* Destroy internal buffer when it is empty and is quite large. */
/* Destroy internal buffer when it is empty and is quite large. */
...
@@ -590,9 +585,7 @@ void redisReplyReaderFeed(redisReader *reader, const char *buf, size_t len) {
...
@@ -590,9 +585,7 @@ void redisReplyReaderFeed(redisReader *reader, const char *buf, size_t len) {
}
}
}
}
int
redisReplyReaderGetReply
(
redisReader
*
reader
,
void
**
reply
)
{
int
redisReplyReaderGetReply
(
redisReader
*
r
,
void
**
reply
)
{
redisReader
*
r
=
reader
;
/* Default target pointer to NULL. */
/* Default target pointer to NULL. */
if
(
reply
!=
NULL
)
if
(
reply
!=
NULL
)
*
reply
=
NULL
;
*
reply
=
NULL
;
...
...
hiredis.h
View file @
20022189
...
@@ -133,11 +133,11 @@ typedef struct redisReader {
...
@@ -133,11 +133,11 @@ typedef struct redisReader {
void
freeReplyObject
(
void
*
reply
);
void
freeReplyObject
(
void
*
reply
);
redisReader
*
redisReplyReaderCreate
(
void
);
redisReader
*
redisReplyReaderCreate
(
void
);
int
redisReplyReaderSetReplyObjectFunctions
(
redisReader
*
r
eader
,
redisReplyObjectFunctions
*
fn
);
int
redisReplyReaderSetReplyObjectFunctions
(
redisReader
*
r
,
redisReplyObjectFunctions
*
fn
);
int
redisReplyReaderSetPrivdata
(
redisReader
*
r
eader
,
void
*
privdata
);
int
redisReplyReaderSetPrivdata
(
redisReader
*
r
,
void
*
privdata
);
void
redisReplyReaderFree
(
redisReader
*
pt
r
);
void
redisReplyReaderFree
(
redisReader
*
r
);
void
redisReplyReaderFeed
(
redisReader
*
r
eader
,
const
char
*
buf
,
size_t
len
);
void
redisReplyReaderFeed
(
redisReader
*
r
,
const
char
*
buf
,
size_t
len
);
int
redisReplyReaderGetReply
(
redisReader
*
r
eader
,
void
**
reply
);
int
redisReplyReaderGetReply
(
redisReader
*
r
,
void
**
reply
);
/* Backwards compatibility, can be removed on big version bump. */
/* Backwards compatibility, can be removed on big version bump. */
#define redisReplyReaderGetObject(_r) (((redisReader*)(r))->reply)
#define redisReplyReaderGetObject(_r) (((redisReader*)(r))->reply)
...
...
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