From 359289d0c01fa8892ccca1ca0e52f1b4d603b673 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20H=C3=BCbinette=20=28Hubbe=29?= <hubbe@hubbe.net>
Date: Fri, 21 Jun 1996 21:29:08 +0200
Subject: [PATCH] better naming
Rev: src/callback.c:1.3
Rev: src/callback.h:1.3
---
src/callback.c | 16 ++++++++--------
src/callback.h | 20 ++++++++++++--------
2 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/src/callback.c b/src/callback.c
index 2cd1ef7888..a760a8a843 100644
--- a/src/callback.c
+++ b/src/callback.c
@@ -31,12 +31,12 @@ static struct callback *get_free_callback()
{
int e;
struct callback_block *tmp2;
- tmp1=ALLOC_STRUCT(callback_block);
+ tmp2=ALLOC_STRUCT(callback_block);
for(e=0;e<sizeof(CALLBACK_CHUNK);e++)
{
- tmp1->callbacks[e].next=tmp;
- tmp=tmp1->callbacks+e;
+ tmp2->callbacks[e].next=tmp;
+ tmp=tmp2->callbacks+e;
}
}
free_callbacks=tmp->next;
@@ -63,9 +63,9 @@ void call_callback(struct callback **ptr)
}
struct callback *add_to_callback(struct callback **ptr,
- callback call,
- void *arg,
- callback free_func)
+ callback_func call,
+ void *arg,
+ callback_func free_func)
{
struct callback *l;
l=get_free_callback();
@@ -91,8 +91,8 @@ void free_callback(struct callback **ptr)
struct callback *l;
while(l=*ptr)
{
- if(l->call.arg && l->call.free_func)
- l->call.free_func(l, l->call.arg);
+ if(l->arg && l->free_func)
+ l->free_func(l, l->arg);
*ptr=l->next;
l->next=free_callbacks;
free_callbacks=l;
diff --git a/src/callback.h b/src/callback.h
index 46c4e152a7..6ba2257f70 100644
--- a/src/callback.h
+++ b/src/callback.h
@@ -8,16 +8,20 @@
#include "array.h"
+struct callback;
+
+typedef void (*callback_func)(struct callback *, void *);
+
/* Prototypes begin here */
-struct callback_list;
+struct callback;
struct callback_block;
-void call_callback_list(struct callback_list **ptr);
-struct callback_list *add_to_callback_list(struct callback_list **ptr,
- callback call,
- void *arg);
-void *remove_callback(struct callback_list *l);
-void free_callback_list(struct callback_list **ptr);
-void call_and_free_callback_list(struct callback_list **ptr);
+void call_callback(struct callback **ptr);
+struct callback *add_to_callback(struct callback **ptr,
+ callback_func call,
+ void *arg,
+ callback_func free_func);
+void *remove_callback(struct callback *l);
+void free_callback(struct callback **ptr);
/* Prototypes end here */
#endif
--
GitLab