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
f0a75950
Commit
f0a75950
authored
Feb 11, 2019
by
Mark Nunberg
Browse files
libevent: call destroy from cleanup
also, indentation fix
parent
1eb44cf0
Changes
1
Hide whitespace changes
Inline
Side-by-side
adapters/libevent.h
View file @
f0a75950
...
...
@@ -47,7 +47,7 @@ typedef struct redisLibeventEvents {
}
redisLibeventEvents
;
static
void
redisLibeventDestroy
(
redisLibeventEvents
*
e
)
{
free
(
e
);
free
(
e
);
}
static
void
redisLibeventHandler
(
int
fd
,
short
event
,
void
*
arg
)
{
...
...
@@ -56,8 +56,8 @@ static void redisLibeventHandler(int fd, short event, void *arg) {
e
->
state
|=
REDIS_LIBEVENT_ENTERED
;
#define CHECK_DELETED() if (e->state & REDIS_LIBEVENT_DELETED) {\
redisLibeventDestroy(e);\
return; \
redisLibeventDestroy(e);\
return; \
}
if
((
event
&
EV_TIMEOUT
)
&&
(
e
->
state
&
REDIS_LIBEVENT_DELETED
)
==
0
)
{
...
...
@@ -122,16 +122,16 @@ static void redisLibeventDelWrite(void *privdata) {
static
void
redisLibeventCleanup
(
void
*
privdata
)
{
redisLibeventEvents
*
e
=
(
redisLibeventEvents
*
)
privdata
;
if
(
!
e
)
{
return
;
return
;
}
event_del
(
e
->
ev
);
event_free
(
e
->
ev
);
e
->
ev
=
NULL
;
if
(
e
->
state
&
REDIS_LIBEVENT_ENTERED
)
{
e
->
state
|=
REDIS_LIBEVENT_DELETED
;
e
->
state
|=
REDIS_LIBEVENT_DELETED
;
}
else
{
free
(
e
);
redisLibeventDestroy
(
e
);
}
}
...
...
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