From 8a904fe3d5f4d9dea125700cdde8e3eec6f065a3 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Mon, 18 May 2026 15:50:37 -0400 Subject: [PATCH] MT#55283 eliminate CUSTOM_POLLER Change-Id: I5fa5f7e7b431ba0dc663407ed3acb94c2c7974b1 --- lib/streambuf.c | 4 ---- recording-daemon/custom_poller.c | 10 +++++++--- recording-daemon/custom_poller.h | 8 -------- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/lib/streambuf.c b/lib/streambuf.c index 52f4c9e5d..d02594969 100644 --- a/lib/streambuf.c +++ b/lib/streambuf.c @@ -8,11 +8,7 @@ #include #include -#ifndef CUSTOM_POLLER #include "poller.h" -#else -#include "custom_poller.h" -#endif #include "auxlib.h" diff --git a/recording-daemon/custom_poller.c b/recording-daemon/custom_poller.c index 0b6edfa5d..db3b3fd93 100644 --- a/recording-daemon/custom_poller.c +++ b/recording-daemon/custom_poller.c @@ -1,11 +1,15 @@ #include "custom_poller.h" -void poller_blocked(struct poller *p, void *fdp) { +static void poller_blocked(struct poller *p, void *fdp) { p->state = PS_WRITE_BLOCKED; } -bool poller_isblocked(struct poller *p, void *fdp) { +static bool poller_isblocked(struct poller *p, void *fdp) { return p->state != PS_OPEN; } -void poller_error(struct poller *p, void *fdp) { +static void poller_error(struct poller *p, void *fdp) { p->state = PS_ERROR; } + +void (*rtpe_poller_blocked)(struct poller *, void *) = poller_blocked; +bool (*rtpe_poller_isblocked)(struct poller *, void *) = poller_isblocked; +void (*rtpe_poller_error)(struct poller *, void *) = poller_error; diff --git a/recording-daemon/custom_poller.h b/recording-daemon/custom_poller.h index ede317a44..146864033 100644 --- a/recording-daemon/custom_poller.h +++ b/recording-daemon/custom_poller.h @@ -15,12 +15,4 @@ struct poller { } state; }; -void poller_blocked(struct poller *, void *); -void poller_error(struct poller *, void *); -bool poller_isblocked(struct poller *, void *); - -#define rtpe_poller_isblocked poller_isblocked -#define rtpe_poller_blocked poller_blocked -#define rtpe_poller_error poller_error - #endif