From a10dd35566fc01147231088f3234301d29d9075d Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Sat, 7 May 2011 12:42:45 +0200 Subject: signal: use namespace prefix osmo_signal* Summary of changes: s/signal_cbfn/osmo_signal_cbfn/g s/register_signal_handler/osmo_signal_register_handler/g s/unregister_signal_handler/osmo_signal_unregister_handler/g s/dispatch_signal/osmo_signal_dispatch/g --- include/osmocom/core/signal.h | 15 +++++++-------- src/signal.c | 11 +++++++---- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/include/osmocom/core/signal.h b/include/osmocom/core/signal.h index 02d83d2e..535fd185 100644 --- a/include/osmocom/core/signal.h +++ b/include/osmocom/core/signal.h @@ -1,15 +1,14 @@ -#ifndef OSMOCORE_SIGNAL_H -#define OSMOCORE_SIGNAL_H +#ifndef OSMO_SIGNAL_H +#define OSMO_SIGNAL_H -typedef int signal_cbfn(unsigned int subsys, unsigned int signal, - void *handler_data, void *signal_data); +typedef int osmo_signal_cbfn(unsigned int subsys, unsigned int signal, void *handler_data, void *signal_data); /* Management */ -int register_signal_handler(unsigned int subsys, signal_cbfn *cbfn, void *data); -void unregister_signal_handler(unsigned int subsys, signal_cbfn *cbfn, void *data); +int osmo_signal_register_handler(unsigned int subsys, osmo_signal_cbfn *cbfn, void *data); +void osmo_signal_unregister_handler(unsigned int subsys, osmo_signal_cbfn *cbfn, void *data); /* Dispatch */ -void dispatch_signal(unsigned int subsys, unsigned int signal, void *signal_data); +void osmo_signal_dispatch(unsigned int subsys, unsigned int signal, void *signal_data); -#endif /* OSMOCORE_SIGNAL_H */ +#endif /* OSMO_SIGNAL_H */ diff --git a/src/signal.c b/src/signal.c index bb5c38e1..bc339bb9 100644 --- a/src/signal.c +++ b/src/signal.c @@ -31,12 +31,13 @@ static LLIST_HEAD(signal_handler_list); struct signal_handler { struct llist_head entry; unsigned int subsys; - signal_cbfn *cbfn; + osmo_signal_cbfn *cbfn; void *data; }; -int register_signal_handler(unsigned int subsys, signal_cbfn *cbfn, void *data) +int osmo_signal_register_handler(unsigned int subsys, + osmo_signal_cbfn *cbfn, void *data) { struct signal_handler *sig_data; @@ -57,7 +58,8 @@ int register_signal_handler(unsigned int subsys, signal_cbfn *cbfn, void *data) return 0; } -void unregister_signal_handler(unsigned int subsys, signal_cbfn *cbfn, void *data) +void osmo_signal_unregister_handler(unsigned int subsys, + osmo_signal_cbfn *cbfn, void *data) { struct signal_handler *handler; @@ -72,7 +74,8 @@ void unregister_signal_handler(unsigned int subsys, signal_cbfn *cbfn, void *dat } -void dispatch_signal(unsigned int subsys, unsigned int signal, void *signal_data) +void osmo_signal_dispatch(unsigned int subsys, unsigned int signal, + void *signal_data) { struct signal_handler *handler; -- cgit v1.2.3