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
6c990440
Commit
6c990440
authored
Jan 09, 2012
by
Pieter Noordhuis
Browse files
No return value for request queue insert
parent
3be58696
Changes
3
Hide whitespace changes
Inline
Side-by-side
request.c
View file @
6c990440
...
...
@@ -43,14 +43,12 @@ int redis_request_queue_destroy(redis_request_queue *self) {
return
REDIS_OK
;
}
int
redis_request_queue_insert
(
redis_request_queue
*
self
,
redis_request
*
request
)
{
void
redis_request_queue_insert
(
redis_request_queue
*
self
,
redis_request
*
request
)
{
ngx_queue_insert_head
(
&
self
->
request_to_write
,
&
request
->
queue
);
if
(
self
->
request_to_write_cb
)
{
self
->
request_to_write_cb
(
self
,
request
);
}
return
REDIS_OK
;
}
redis_request
*
redis__request_queue_move
(
ngx_queue_t
*
a
,
ngx_queue_t
*
b
)
{
...
...
request.h
View file @
6c990440
...
...
@@ -124,7 +124,7 @@ int redis_request_destroy(redis_request *self);
int
redis_request_queue_init
(
redis_request_queue
*
self
);
int
redis_request_queue_destroy
(
redis_request_queue
*
self
);
int
redis_request_queue_insert
(
redis_request_queue
*
self
,
redis_request
*
request
);
void
redis_request_queue_insert
(
redis_request_queue
*
self
,
redis_request
*
request
);
int
redis_request_queue_write_ptr
(
redis_request_queue
*
self
,
const
char
**
buf
,
size_t
*
len
);
int
redis_request_queue_write_cb
(
redis_request_queue
*
self
,
int
n
);
int
redis_request_queue_read_cb
(
redis_request_queue
*
self
,
const
char
*
buf
,
size_t
len
);
...
...
test/test-request.c
View file @
6c990440
...
...
@@ -209,8 +209,7 @@ TEST(insert_request) {
req
.
len
=
strlen
(
req
.
buf
);
req
.
emit
=
2
;
rv
=
redis_request_queue_insert
(
&
q
,
(
redis_request
*
)
&
req
);
assert_equal_return
(
rv
,
REDIS_OK
);
redis_request_queue_insert
(
&
q
,
(
redis_request
*
)
&
req
);
/* Test that callback was correctly triggered */
assert_equal_int
(
request_to_write_cb_calls
.
callc
,
1
);
...
...
@@ -231,10 +230,8 @@ TEST(insert_request) {
req2.buf = "world"; \
req2.len = strlen(req2.buf); \
req2.emit = req2.len; \
rv = redis_request_queue_insert(&q, (redis_request*)&req1); \
assert_equal_return(rv, REDIS_OK); \
rv = redis_request_queue_insert(&q, (redis_request*)&req2); \
assert_equal_return(rv, REDIS_OK);
redis_request_queue_insert(&q, (redis_request*)&req1); \
redis_request_queue_insert(&q, (redis_request*)&req2); \
TEST
(
write_ptr
)
{
SETUP_INSERTED
();
...
...
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