kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 11:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

stasis: Fix ABI between DEVMODE and non-DEVMODE.

Browse Source 
Eliminate differences with DEVMODE prototypes for public functions.

ASTERISK-28212 #close

Change-Id: I872c04842ab6b61e9dd6d37e4166bc619aa20626
This commit is contained in:
Corey Farrell
2018-12-26 12:49:57 -05:00
parent 4c084c6b1b
commit 110934706f
6 changed files with 3 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
main/stasis.c
View File

@@ -436,10 +436,11 @@ struct stasis_topic *stasis_topic_create(const char *name)
res |= AST_VECTOR_INIT(&topic->upstream_topics, 0);
#ifdef AST_DEVMODE
topic->statistics = stasis_topic_statistics_create(name);
if (!topic->name || !topic->statistics || res) {
if (!topic->name || !topic->statistics || res)
#else
if (!topic->name || res) {
if (!topic->name || res)
#endif
{
ao2_ref(topic, -1);
return NULL;
}
@@ -640,7 +641,6 @@ static struct stasis_subscription_statistics *stasis_subscription_statistics_cre
}
#endif
#ifdef AST_DEVMODE
struct stasis_subscription *internal_stasis_subscribe(
struct stasis_topic *topic,
stasis_subscription_cb callback,
@@ -650,14 +650,6 @@ struct stasis_subscription *internal_stasis_subscribe(
const char *file,
int lineno,
const char *func)
#else
struct stasis_subscription *internal_stasis_subscribe(
struct stasis_topic *topic,
stasis_subscription_cb callback,
void *data,
int needs_mailbox,
int use_thread_pool)
#endif
{
struct stasis_subscription *sub;
@@ -728,7 +720,6 @@ struct stasis_subscription *internal_stasis_subscribe(
return sub;
}
#ifdef AST_DEVMODE
struct stasis_subscription *__stasis_subscribe(
struct stasis_topic *topic,
stasis_subscription_cb callback,
@@ -739,17 +730,7 @@ struct stasis_subscription *__stasis_subscribe(
{
return internal_stasis_subscribe(topic, callback, data, 1, 0, file, lineno, func);
}
#else
struct stasis_subscription *stasis_subscribe(
struct stasis_topic *topic,
stasis_subscription_cb callback,
void *data)
{
return internal_stasis_subscribe(topic, callback, data, 1, 0);
}
#endif
#ifdef AST_DEVMODE
struct stasis_subscription *__stasis_subscribe_pool(
struct stasis_topic *topic,
stasis_subscription_cb callback,
@@ -760,15 +741,6 @@ struct stasis_subscription *__stasis_subscribe_pool(
{
return internal_stasis_subscribe(topic, callback, data, 1, 1, file, lineno, func);
}
#else
struct stasis_subscription *stasis_subscribe_pool(
struct stasis_topic *topic,
stasis_subscription_cb callback,
void *data)
{
return internal_stasis_subscribe(topic, callback, data, 1, 1);
}
#endif
static int sub_cleanup(void *data)
{