summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--code/ecp/timer.c4
-rw-r--r--code/ecp/timer.h6
2 files changed, 5 insertions, 5 deletions
diff --git a/code/ecp/timer.c b/code/ecp/timer.c
index f091464..96a69d0 100644
--- a/code/ecp/timer.c
+++ b/code/ecp/timer.c
@@ -183,7 +183,7 @@ ecp_cts_t ecp_timer_exe(ECPSocket *sock) {
int rv = ECP_OK;
ECPConnection *conn = to_exec[i].conn;
unsigned char mtype = to_exec[i].mtype;
- ecp_timer_retry_t *retry = to_exec[i].retry;
+ ecp_timer_retry_t retry = to_exec[i].retry;
ecp_conn_handler_msg_t *handler = conn->sock->ctx->handler[conn->type] ? conn->sock->ctx->handler[conn->type]->msg[mtype & ECP_MTYPE_MASK] : NULL;
if (to_exec[i].cnt > 0) {
@@ -211,7 +211,7 @@ ecp_cts_t ecp_timer_exe(ECPSocket *sock) {
return ret;
}
-ssize_t ecp_timer_send(ECPConnection *conn, ecp_timer_retry_t *send_f, unsigned char mtype, short cnt, ecp_cts_t timeout) {
+ssize_t ecp_timer_send(ECPConnection *conn, ecp_timer_retry_t send_f, unsigned char mtype, short cnt, ecp_cts_t timeout) {
int rv = ECP_OK;
ECPTimerItem ti;
diff --git a/code/ecp/timer.h b/code/ecp/timer.h
index 9c80007..5bccff1 100644
--- a/code/ecp/timer.h
+++ b/code/ecp/timer.h
@@ -4,7 +4,7 @@
struct ECPTimerItem;
-typedef ssize_t ecp_timer_retry_t (struct ECPConnection *, struct ECPTimerItem *);
+typedef ssize_t (*ecp_timer_retry_t) (struct ECPConnection *, struct ECPTimerItem *);
typedef struct ECPTimerItem {
struct ECPConnection *conn;
@@ -12,7 +12,7 @@ typedef struct ECPTimerItem {
short cnt;
ecp_cts_t abstime;
ecp_cts_t timeout;
- ecp_timer_retry_t *retry;
+ ecp_timer_retry_t retry;
} ECPTimerItem;
typedef struct ECPTimer {
@@ -30,4 +30,4 @@ int ecp_timer_push(ECPTimerItem *ti);
void ecp_timer_pop(struct ECPConnection *conn, unsigned char mtype);
void ecp_timer_remove(struct ECPConnection *conn);
ecp_cts_t ecp_timer_exe(struct ECPSocket *sock);
-ssize_t ecp_timer_send(struct ECPConnection *conn, ecp_timer_retry_t *send_f, unsigned char mtype, short cnt, ecp_cts_t timeout); \ No newline at end of file
+ssize_t ecp_timer_send(struct ECPConnection *conn, ecp_timer_retry_t send_f, unsigned char mtype, short cnt, ecp_cts_t timeout);