summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Joseph <gjoseph@digium.com>2017-04-16 18:59:54 -0600
committerGeorge Joseph <gjoseph@digium.com>2017-04-16 18:59:54 -0600
commitb55d21ad919b42829721ca3a0f7425a0b429ff12 (patch)
tree636725d646446ad0f21130e1bf765a0c21d19284
parent49535c17fc6feefb1533e5460d9bde5815178647 (diff)
make ari-stubs so doc periodic jobs can run
The periodic doc job does a make ari-stubs and checks that there are no changes before generating the docs. Since I changed the mustache template (and the generated code directly) recently and forgot to regenerate the stubs, the doc job thinks they're out of date. Change-Id: I94b97035311eccf52b0101b8590223265a7881d4
-rw-r--r--res/ari/resource_channels.h4
-rw-r--r--res/res_ari_applications.c19
-rw-r--r--res/res_ari_asterisk.c19
-rw-r--r--res/res_ari_bridges.c19
-rw-r--r--res/res_ari_channels.c19
-rw-r--r--res/res_ari_device_states.c19
-rw-r--r--res/res_ari_endpoints.c19
-rw-r--r--res/res_ari_events.c1
-rw-r--r--res/res_ari_mailboxes.c19
-rw-r--r--res/res_ari_playbacks.c19
-rw-r--r--res/res_ari_recordings.c19
-rw-r--r--res/res_ari_sounds.c19
12 files changed, 122 insertions, 73 deletions
diff --git a/res/ari/resource_channels.h b/res/ari/resource_channels.h
index f68db2f5b..b071d08ba 100644
--- a/res/ari/resource_channels.h
+++ b/res/ari/resource_channels.h
@@ -78,7 +78,7 @@ struct ast_ari_channels_originate_args {
const char *other_channel_id;
/*! The unique id of the channel which is originating this one. */
const char *originator;
- /*! The format name capability list to use if originator is not specified. Ex. "ulaw,slin16". Format names an be found with "core show codecs". */
+ /*! The format name capability list to use if originator is not specified. Ex. "ulaw,slin16". Format names can be found with "core show codecs". */
const char *formats;
};
/*!
@@ -179,7 +179,7 @@ struct ast_ari_channels_originate_with_id_args {
const char *other_channel_id;
/*! The unique id of the channel which is originating this one. */
const char *originator;
- /*! The format name capability list to use if originator is not specified. Ex. "ulaw,slin16". Format names an be found with "core show codecs". */
+ /*! The format name capability list to use if originator is not specified. Ex. "ulaw,slin16". Format names can be found with "core show codecs". */
const char *formats;
};
/*!
diff --git a/res/res_ari_applications.c b/res/res_ari_applications.c
index 951ee85b7..21d9f56eb 100644
--- a/res/res_ari_applications.c
+++ b/res/res_ari_applications.c
@@ -490,19 +490,24 @@ static struct stasis_rest_handlers applications = {
.children = { &applications_applicationName, }
};
+static int unload_module(void)
+{
+ ast_ari_remove_handler(&applications);
+ stasis_app_unref();
+ return 0;
+}
+
static int load_module(void)
{
int res = 0;
stasis_app_ref();
res |= ast_ari_add_handler(&applications);
- return res;
-}
+ if (res) {
+ unload_module();
+ return AST_MODULE_LOAD_DECLINE;
+ }
-static int unload_module(void)
-{
- ast_ari_remove_handler(&applications);
- stasis_app_unref();
- return 0;
+ return AST_MODULE_LOAD_SUCCESS;
}
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Stasis application resources",
diff --git a/res/res_ari_asterisk.c b/res/res_ari_asterisk.c
index 1dbd850bb..89517ccae 100644
--- a/res/res_ari_asterisk.c
+++ b/res/res_ari_asterisk.c
@@ -1211,19 +1211,24 @@ static struct stasis_rest_handlers asterisk = {
.children = { &asterisk_config,&asterisk_info,&asterisk_modules,&asterisk_logging,&asterisk_variable, }
};
+static int unload_module(void)
+{
+ ast_ari_remove_handler(&asterisk);
+ stasis_app_unref();
+ return 0;
+}
+
static int load_module(void)
{
int res = 0;
stasis_app_ref();
res |= ast_ari_add_handler(&asterisk);
- return res;
-}
+ if (res) {
+ unload_module();
+ return AST_MODULE_LOAD_DECLINE;
+ }
-static int unload_module(void)
-{
- ast_ari_remove_handler(&asterisk);
- stasis_app_unref();
- return 0;
+ return AST_MODULE_LOAD_SUCCESS;
}
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Asterisk resources",
diff --git a/res/res_ari_bridges.c b/res/res_ari_bridges.c
index e61865e31..5402c2b99 100644
--- a/res/res_ari_bridges.c
+++ b/res/res_ari_bridges.c
@@ -1537,19 +1537,24 @@ static struct stasis_rest_handlers bridges = {
.children = { &bridges_bridgeId, }
};
+static int unload_module(void)
+{
+ ast_ari_remove_handler(&bridges);
+ stasis_app_unref();
+ return 0;
+}
+
static int load_module(void)
{
int res = 0;
stasis_app_ref();
res |= ast_ari_add_handler(&bridges);
- return res;
-}
+ if (res) {
+ unload_module();
+ return AST_MODULE_LOAD_DECLINE;
+ }
-static int unload_module(void)
-{
- ast_ari_remove_handler(&bridges);
- stasis_app_unref();
- return 0;
+ return AST_MODULE_LOAD_SUCCESS;
}
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Bridge resources",
diff --git a/res/res_ari_channels.c b/res/res_ari_channels.c
index 739eb0135..9d218e2be 100644
--- a/res/res_ari_channels.c
+++ b/res/res_ari_channels.c
@@ -2841,19 +2841,24 @@ static struct stasis_rest_handlers channels = {
.children = { &channels_create,&channels_channelId, }
};
+static int unload_module(void)
+{
+ ast_ari_remove_handler(&channels);
+ stasis_app_unref();
+ return 0;
+}
+
static int load_module(void)
{
int res = 0;
stasis_app_ref();
res |= ast_ari_add_handler(&channels);
- return res;
-}
+ if (res) {
+ unload_module();
+ return AST_MODULE_LOAD_DECLINE;
+ }
-static int unload_module(void)
-{
- ast_ari_remove_handler(&channels);
- stasis_app_unref();
- return 0;
+ return AST_MODULE_LOAD_SUCCESS;
}
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Channel resources",
diff --git a/res/res_ari_device_states.c b/res/res_ari_device_states.c
index b2aea525e..d6de5dff8 100644
--- a/res/res_ari_device_states.c
+++ b/res/res_ari_device_states.c
@@ -321,19 +321,24 @@ static struct stasis_rest_handlers deviceStates = {
.children = { &deviceStates_deviceName, }
};
+static int unload_module(void)
+{
+ ast_ari_remove_handler(&deviceStates);
+ stasis_app_unref();
+ return 0;
+}
+
static int load_module(void)
{
int res = 0;
stasis_app_ref();
res |= ast_ari_add_handler(&deviceStates);
- return res;
-}
+ if (res) {
+ unload_module();
+ return AST_MODULE_LOAD_DECLINE;
+ }
-static int unload_module(void)
-{
- ast_ari_remove_handler(&deviceStates);
- stasis_app_unref();
- return 0;
+ return AST_MODULE_LOAD_SUCCESS;
}
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Device state resources",
diff --git a/res/res_ari_endpoints.c b/res/res_ari_endpoints.c
index 944146fcb..d96de0877 100644
--- a/res/res_ari_endpoints.c
+++ b/res/res_ari_endpoints.c
@@ -445,19 +445,24 @@ static struct stasis_rest_handlers endpoints = {
.children = { &endpoints_sendMessage,&endpoints_tech, }
};
+static int unload_module(void)
+{
+ ast_ari_remove_handler(&endpoints);
+ stasis_app_unref();
+ return 0;
+}
+
static int load_module(void)
{
int res = 0;
stasis_app_ref();
res |= ast_ari_add_handler(&endpoints);
- return res;
-}
+ if (res) {
+ unload_module();
+ return AST_MODULE_LOAD_DECLINE;
+ }
-static int unload_module(void)
-{
- ast_ari_remove_handler(&endpoints);
- stasis_app_unref();
- return 0;
+ return AST_MODULE_LOAD_SUCCESS;
}
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Endpoint resources",
diff --git a/res/res_ari_events.c b/res/res_ari_events.c
index 76b791719..3f5b89a44 100644
--- a/res/res_ari_events.c
+++ b/res/res_ari_events.c
@@ -454,7 +454,6 @@ static int load_module(void)
res |= ast_websocket_server_add_protocol2(events.ws_server, protocol);
stasis_app_ref();
res |= ast_ari_add_handler(&events);
-
if (res) {
unload_module();
return AST_MODULE_LOAD_DECLINE;
diff --git a/res/res_ari_mailboxes.c b/res/res_ari_mailboxes.c
index 2eac60987..12c33cd88 100644
--- a/res/res_ari_mailboxes.c
+++ b/res/res_ari_mailboxes.c
@@ -327,19 +327,24 @@ static struct stasis_rest_handlers mailboxes = {
.children = { &mailboxes_mailboxName, }
};
+static int unload_module(void)
+{
+ ast_ari_remove_handler(&mailboxes);
+ stasis_app_unref();
+ return 0;
+}
+
static int load_module(void)
{
int res = 0;
stasis_app_ref();
res |= ast_ari_add_handler(&mailboxes);
- return res;
-}
+ if (res) {
+ unload_module();
+ return AST_MODULE_LOAD_DECLINE;
+ }
-static int unload_module(void)
-{
- ast_ari_remove_handler(&mailboxes);
- stasis_app_unref();
- return 0;
+ return AST_MODULE_LOAD_SUCCESS;
}
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Mailboxes resources",
diff --git a/res/res_ari_playbacks.c b/res/res_ari_playbacks.c
index 8267a91b5..e2c432db0 100644
--- a/res/res_ari_playbacks.c
+++ b/res/res_ari_playbacks.c
@@ -279,19 +279,24 @@ static struct stasis_rest_handlers playbacks = {
.children = { &playbacks_playbackId, }
};
+static int unload_module(void)
+{
+ ast_ari_remove_handler(&playbacks);
+ stasis_app_unref();
+ return 0;
+}
+
static int load_module(void)
{
int res = 0;
stasis_app_ref();
res |= ast_ari_add_handler(&playbacks);
- return res;
-}
+ if (res) {
+ unload_module();
+ return AST_MODULE_LOAD_DECLINE;
+ }
-static int unload_module(void)
-{
- ast_ari_remove_handler(&playbacks);
- stasis_app_unref();
- return 0;
+ return AST_MODULE_LOAD_SUCCESS;
}
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Playback control resources",
diff --git a/res/res_ari_recordings.c b/res/res_ari_recordings.c
index e82605c7b..57d80f2e0 100644
--- a/res/res_ari_recordings.c
+++ b/res/res_ari_recordings.c
@@ -863,19 +863,24 @@ static struct stasis_rest_handlers recordings = {
.children = { &recordings_stored,&recordings_live, }
};
+static int unload_module(void)
+{
+ ast_ari_remove_handler(&recordings);
+ stasis_app_unref();
+ return 0;
+}
+
static int load_module(void)
{
int res = 0;
stasis_app_ref();
res |= ast_ari_add_handler(&recordings);
- return res;
-}
+ if (res) {
+ unload_module();
+ return AST_MODULE_LOAD_DECLINE;
+ }
-static int unload_module(void)
-{
- ast_ari_remove_handler(&recordings);
- stasis_app_unref();
- return 0;
+ return AST_MODULE_LOAD_SUCCESS;
}
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Recording resources",
diff --git a/res/res_ari_sounds.c b/res/res_ari_sounds.c
index fe0692f16..fded7fbce 100644
--- a/res/res_ari_sounds.c
+++ b/res/res_ari_sounds.c
@@ -209,19 +209,24 @@ static struct stasis_rest_handlers sounds = {
.children = { &sounds_soundId, }
};
+static int unload_module(void)
+{
+ ast_ari_remove_handler(&sounds);
+ stasis_app_unref();
+ return 0;
+}
+
static int load_module(void)
{
int res = 0;
stasis_app_ref();
res |= ast_ari_add_handler(&sounds);
- return res;
-}
+ if (res) {
+ unload_module();
+ return AST_MODULE_LOAD_DECLINE;
+ }
-static int unload_module(void)
-{
- ast_ari_remove_handler(&sounds);
- stasis_app_unref();
- return 0;
+ return AST_MODULE_LOAD_SUCCESS;
}
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Sound resources",