From c14b40caafb26a02249f062e7f907ceaa53c1b74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Tue, 30 Jun 2020 13:09:13 +0300
Subject: [PATCH] Rename callback typedefs for consistency
---
libndi.c | 4 ++--
libndi.h | 8 ++++----
libndi_discovery_microdns.c | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/libndi.c b/libndi.c
index a978a50..1edecbf 100644
--- a/libndi.c
+++ b/libndi.c
@@ -77,7 +77,7 @@ struct ndi_ctx
ndi_message ndi_request[4];
int pending_requests;
- ndi_data_callback callback;
+ ndi_data_cb callback;
void *user_data;
/* options */
@@ -561,7 +561,7 @@ static void system_Init(void) {
static void system_Init(void) { return; }
#endif
-void libndi_receive_data(ndi_ctx *ndi_ctx, ndi_data_callback callback, void *user_data)
+void libndi_receive_data(ndi_ctx *ndi_ctx, ndi_data_cb callback, void *user_data)
{
ndi_ctx->callback = callback;
ndi_ctx->user_data = user_data;
diff --git a/libndi.h b/libndi.h
index b23cf02..31ee727 100644
--- a/libndi.h
+++ b/libndi.h
@@ -83,9 +83,9 @@ static inline void libndi_discovery_item_destroy(ndi_discovery_item_t *item) {
free(item);
}
-typedef void (*libndi_discovery_cb)(ndi_discovery_item_t *item, void *user_data);
+typedef void (*ndi_discovery_cb)(ndi_discovery_item_t *item, void *user_data);
-ndi_discovery_ctx_t *libndi_discovery_init(libndi_discovery_cb callback, void *user_data);
+ndi_discovery_ctx_t *libndi_discovery_init(ndi_discovery_cb callback, void *user_data);
int libndi_discovery_start(ndi_discovery_ctx_t *ctx);
int libndi_discovery_stop(ndi_discovery_ctx_t *ctx);
void libndi_discovery_destroy(ndi_discovery_ctx_t *ctx);
@@ -101,8 +101,8 @@ typedef struct
int libndi_setup(ndi_ctx *ndi_ctx, ndi_opts *ndi_opts);
-typedef void (*ndi_data_callback)(ndi_data *ndi_data, void *user_data);
-void libndi_receive_data(ndi_ctx *ndi_ctx, ndi_data_callback callback, void *user_data);
+typedef void (*ndi_data_cb)(ndi_data *ndi_data, void *user_data);
+void libndi_receive_data(ndi_ctx *ndi_ctx, ndi_data_cb callback, void *user_data);
void libndi_close(ndi_ctx *ndi_ctx);
diff --git a/libndi_discovery_microdns.c b/libndi_discovery_microdns.c
index f2cf288..0779259 100644
--- a/libndi_discovery_microdns.c
+++ b/libndi_discovery_microdns.c
@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#include "libndi.h"
struct ndi_discovery_ctx {
- libndi_discovery_cb cb;
+ ndi_discovery_cb cb;
struct mdns_ctx *mctx;
pthread_t thread;
pthread_mutex_t mutex;
@@ -38,7 +38,7 @@ struct ndi_discovery_ctx {
void *user_data;
};
-ndi_discovery_ctx_t *libndi_discovery_init(libndi_discovery_cb callback, void *user_data)
+ndi_discovery_ctx_t *libndi_discovery_init(ndi_discovery_cb callback, void *user_data)
{
ndi_discovery_ctx_t *ctx = calloc(1, sizeof(ndi_discovery_ctx_t));
if (!ctx)
--
GitLab