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
a9c21e4d
Commit
a9c21e4d
authored
Apr 09, 2014
by
Pieter Noordhuis
Browse files
Fix const correctness
parent
fa8bcca1
Changes
6
Hide whitespace changes
Inline
Side-by-side
async.c
View file @
a9c21e4d
...
@@ -166,7 +166,7 @@ redisAsyncContext *redisAsyncConnect(const char *ip, int port) {
...
@@ -166,7 +166,7 @@ redisAsyncContext *redisAsyncConnect(const char *ip, int port) {
}
}
redisAsyncContext
*
redisAsyncConnectBind
(
const
char
*
ip
,
int
port
,
redisAsyncContext
*
redisAsyncConnectBind
(
const
char
*
ip
,
int
port
,
char
*
source_addr
)
{
const
char
*
source_addr
)
{
redisContext
*
c
=
redisConnectBindNonBlock
(
ip
,
port
,
source_addr
);
redisContext
*
c
=
redisConnectBindNonBlock
(
ip
,
port
,
source_addr
);
redisAsyncContext
*
ac
=
redisAsyncInitialize
(
c
);
redisAsyncContext
*
ac
=
redisAsyncInitialize
(
c
);
__redisAsyncCopyError
(
ac
);
__redisAsyncCopyError
(
ac
);
...
...
async.h
View file @
a9c21e4d
...
@@ -102,7 +102,7 @@ typedef struct redisAsyncContext {
...
@@ -102,7 +102,7 @@ typedef struct redisAsyncContext {
/* Functions that proxy to hiredis */
/* Functions that proxy to hiredis */
redisAsyncContext
*
redisAsyncConnect
(
const
char
*
ip
,
int
port
);
redisAsyncContext
*
redisAsyncConnect
(
const
char
*
ip
,
int
port
);
redisAsyncContext
*
redisAsyncConnectBind
(
const
char
*
ip
,
int
port
,
char
*
source
);
redisAsyncContext
*
redisAsyncConnectBind
(
const
char
*
ip
,
int
port
,
const
char
*
source
_addr
);
redisAsyncContext
*
redisAsyncConnectUnix
(
const
char
*
path
);
redisAsyncContext
*
redisAsyncConnectUnix
(
const
char
*
path
);
int
redisAsyncSetConnectCallback
(
redisAsyncContext
*
ac
,
redisConnectCallback
*
fn
);
int
redisAsyncSetConnectCallback
(
redisAsyncContext
*
ac
,
redisConnectCallback
*
fn
);
int
redisAsyncSetDisconnectCallback
(
redisAsyncContext
*
ac
,
redisDisconnectCallback
*
fn
);
int
redisAsyncSetDisconnectCallback
(
redisAsyncContext
*
ac
,
redisDisconnectCallback
*
fn
);
...
...
hiredis.c
View file @
a9c21e4d
...
@@ -1057,7 +1057,7 @@ redisContext *redisConnectNonBlock(const char *ip, int port) {
...
@@ -1057,7 +1057,7 @@ redisContext *redisConnectNonBlock(const char *ip, int port) {
}
}
redisContext
*
redisConnectBindNonBlock
(
const
char
*
ip
,
int
port
,
redisContext
*
redisConnectBindNonBlock
(
const
char
*
ip
,
int
port
,
char
*
source_addr
)
{
const
char
*
source_addr
)
{
redisContext
*
c
=
redisContextInit
();
redisContext
*
c
=
redisContextInit
();
c
->
flags
&=
~
REDIS_BLOCK
;
c
->
flags
&=
~
REDIS_BLOCK
;
redisContextConnectBindTcp
(
c
,
ip
,
port
,
NULL
,
source_addr
);
redisContextConnectBindTcp
(
c
,
ip
,
port
,
NULL
,
source_addr
);
...
@@ -1244,7 +1244,7 @@ int redisGetReply(redisContext *c, void **reply) {
...
@@ -1244,7 +1244,7 @@ int redisGetReply(redisContext *c, void **reply) {
* is used, you need to call redisGetReply yourself to retrieve
* is used, you need to call redisGetReply yourself to retrieve
* the reply (or replies in pub/sub).
* the reply (or replies in pub/sub).
*/
*/
int
__redisAppendCommand
(
redisContext
*
c
,
char
*
cmd
,
size_t
len
)
{
int
__redisAppendCommand
(
redisContext
*
c
,
const
char
*
cmd
,
size_t
len
)
{
sds
newbuf
;
sds
newbuf
;
newbuf
=
sdscatlen
(
c
->
obuf
,
cmd
,
len
);
newbuf
=
sdscatlen
(
c
->
obuf
,
cmd
,
len
);
...
@@ -1257,9 +1257,9 @@ int __redisAppendCommand(redisContext *c, char *cmd, size_t len) {
...
@@ -1257,9 +1257,9 @@ int __redisAppendCommand(redisContext *c, char *cmd, size_t len) {
return
REDIS_OK
;
return
REDIS_OK
;
}
}
int
redisAppendFormattedCommand
(
redisContext
*
c
,
c
har
*
format
,
size_t
len
)
{
int
redisAppendFormattedCommand
(
redisContext
*
c
,
c
onst
char
*
cmd
,
size_t
len
)
{
if
(
__redisAppendCommand
(
c
,
format
,
len
)
!=
REDIS_OK
)
{
if
(
__redisAppendCommand
(
c
,
cmd
,
len
)
!=
REDIS_OK
)
{
return
REDIS_ERR
;
return
REDIS_ERR
;
}
}
...
...
hiredis.h
View file @
a9c21e4d
...
@@ -175,7 +175,7 @@ typedef struct redisContext {
...
@@ -175,7 +175,7 @@ typedef struct redisContext {
redisContext
*
redisConnect
(
const
char
*
ip
,
int
port
);
redisContext
*
redisConnect
(
const
char
*
ip
,
int
port
);
redisContext
*
redisConnectWithTimeout
(
const
char
*
ip
,
int
port
,
const
struct
timeval
tv
);
redisContext
*
redisConnectWithTimeout
(
const
char
*
ip
,
int
port
,
const
struct
timeval
tv
);
redisContext
*
redisConnectNonBlock
(
const
char
*
ip
,
int
port
);
redisContext
*
redisConnectNonBlock
(
const
char
*
ip
,
int
port
);
redisContext
*
redisConnectBindNonBlock
(
const
char
*
ip
,
int
port
,
char
*
source
);
redisContext
*
redisConnectBindNonBlock
(
const
char
*
ip
,
int
port
,
const
char
*
source
_addr
);
redisContext
*
redisConnectUnix
(
const
char
*
path
);
redisContext
*
redisConnectUnix
(
const
char
*
path
);
redisContext
*
redisConnectUnixWithTimeout
(
const
char
*
path
,
const
struct
timeval
tv
);
redisContext
*
redisConnectUnixWithTimeout
(
const
char
*
path
,
const
struct
timeval
tv
);
redisContext
*
redisConnectUnixNonBlock
(
const
char
*
path
);
redisContext
*
redisConnectUnixNonBlock
(
const
char
*
path
);
...
@@ -196,7 +196,7 @@ int redisGetReplyFromReader(redisContext *c, void **reply);
...
@@ -196,7 +196,7 @@ int redisGetReplyFromReader(redisContext *c, void **reply);
/* Write a formatted command to the output buffer. Use these functions in blocking mode
/* Write a formatted command to the output buffer. Use these functions in blocking mode
* to get a pipeline of commands. */
* to get a pipeline of commands. */
int
redisAppendFormattedCommand
(
redisContext
*
c
,
c
har
*
format
,
size_t
len
);
int
redisAppendFormattedCommand
(
redisContext
*
c
,
c
onst
char
*
cmd
,
size_t
len
);
/* Write a command to the output buffer. Use these functions in blocking mode
/* Write a command to the output buffer. Use these functions in blocking mode
* to get a pipeline of commands. */
* to get a pipeline of commands. */
...
...
net.c
View file @
a9c21e4d
...
@@ -255,7 +255,7 @@ int redisContextSetTimeout(redisContext *c, const struct timeval tv) {
...
@@ -255,7 +255,7 @@ int redisContextSetTimeout(redisContext *c, const struct timeval tv) {
static
int
_redisContextConnectTcp
(
redisContext
*
c
,
const
char
*
addr
,
int
port
,
static
int
_redisContextConnectTcp
(
redisContext
*
c
,
const
char
*
addr
,
int
port
,
const
struct
timeval
*
timeout
,
const
struct
timeval
*
timeout
,
char
*
source_addr
)
{
const
char
*
source_addr
)
{
int
s
,
rv
;
int
s
,
rv
;
char
_port
[
6
];
/* strlen("65535"); */
char
_port
[
6
];
/* strlen("65535"); */
struct
addrinfo
hints
,
*
servinfo
,
*
bservinfo
,
*
p
,
*
b
;
struct
addrinfo
hints
,
*
servinfo
,
*
bservinfo
,
*
p
,
*
b
;
...
@@ -347,7 +347,8 @@ int redisContextConnectTcp(redisContext *c, const char *addr, int port,
...
@@ -347,7 +347,8 @@ int redisContextConnectTcp(redisContext *c, const char *addr, int port,
}
}
int
redisContextConnectBindTcp
(
redisContext
*
c
,
const
char
*
addr
,
int
port
,
int
redisContextConnectBindTcp
(
redisContext
*
c
,
const
char
*
addr
,
int
port
,
const
struct
timeval
*
timeout
,
char
*
source_addr
)
{
const
struct
timeval
*
timeout
,
const
char
*
source_addr
)
{
return
_redisContextConnectTcp
(
c
,
addr
,
port
,
timeout
,
source_addr
);
return
_redisContextConnectTcp
(
c
,
addr
,
port
,
timeout
,
source_addr
);
}
}
...
...
net.h
View file @
a9c21e4d
...
@@ -43,7 +43,8 @@ int redisCheckSocketError(redisContext *c);
...
@@ -43,7 +43,8 @@ int redisCheckSocketError(redisContext *c);
int
redisContextSetTimeout
(
redisContext
*
c
,
const
struct
timeval
tv
);
int
redisContextSetTimeout
(
redisContext
*
c
,
const
struct
timeval
tv
);
int
redisContextConnectTcp
(
redisContext
*
c
,
const
char
*
addr
,
int
port
,
const
struct
timeval
*
timeout
);
int
redisContextConnectTcp
(
redisContext
*
c
,
const
char
*
addr
,
int
port
,
const
struct
timeval
*
timeout
);
int
redisContextConnectBindTcp
(
redisContext
*
c
,
const
char
*
addr
,
int
port
,
int
redisContextConnectBindTcp
(
redisContext
*
c
,
const
char
*
addr
,
int
port
,
const
struct
timeval
*
timeout
,
char
*
source_addr
);
const
struct
timeval
*
timeout
,
const
char
*
source_addr
);
int
redisContextConnectUnix
(
redisContext
*
c
,
const
char
*
path
,
const
struct
timeval
*
timeout
);
int
redisContextConnectUnix
(
redisContext
*
c
,
const
char
*
path
,
const
struct
timeval
*
timeout
);
int
redisKeepAlive
(
redisContext
*
c
,
int
interval
);
int
redisKeepAlive
(
redisContext
*
c
,
int
interval
);
...
...
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