[Asterisk-code-review] make ari-stubs so doc periodic jobs can run (asterisk[master])
George Joseph
asteriskteam at digium.com
Thu Apr 20 07:17:29 CDT 2017
George Joseph has submitted this change and it was merged. ( https://gerrit.asterisk.org/5495 )
Change subject: make ari-stubs so doc periodic jobs can run
......................................................................
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
---
M res/ari/resource_channels.h
M res/res_ari_applications.c
M res/res_ari_asterisk.c
M res/res_ari_bridges.c
M res/res_ari_channels.c
M res/res_ari_device_states.c
M res/res_ari_endpoints.c
M res/res_ari_events.c
M res/res_ari_mailboxes.c
M res/res_ari_playbacks.c
M res/res_ari_recordings.c
M res/res_ari_sounds.c
12 files changed, 132 insertions(+), 83 deletions(-)
Approvals:
Mark Michelson: Looks good to me, approved
George Joseph: Looks good to me, approved; Verified
Richard Mudgett: Looks good to me, but someone else must approve
Joshua Colp: Looks good to me, but someone else must approve
diff --git a/res/ari/resource_channels.h b/res/ari/resource_channels.h
index f68db2f..b071d08 100644
--- a/res/ari/resource_channels.h
+++ b/res/ari/resource_channels.h
@@ -78,7 +78,7 @@
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 @@
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 951ee85..21d9f56 100644
--- a/res/res_ari_applications.c
+++ b/res/res_ari_applications.c
@@ -490,14 +490,6 @@
.children = { &applications_applicationName, }
};
-static int load_module(void)
-{
- int res = 0;
- stasis_app_ref();
- res |= ast_ari_add_handler(&applications);
- return res;
-}
-
static int unload_module(void)
{
ast_ari_remove_handler(&applications);
@@ -505,6 +497,19 @@
return 0;
}
+static int load_module(void)
+{
+ int res = 0;
+ stasis_app_ref();
+ res |= ast_ari_add_handler(&applications);
+ if (res) {
+ unload_module();
+ return AST_MODULE_LOAD_DECLINE;
+ }
+
+ return AST_MODULE_LOAD_SUCCESS;
+}
+
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Stasis application resources",
.support_level = AST_MODULE_SUPPORT_CORE,
.load = load_module,
diff --git a/res/res_ari_asterisk.c b/res/res_ari_asterisk.c
index 1dbd850..89517cc 100644
--- a/res/res_ari_asterisk.c
+++ b/res/res_ari_asterisk.c
@@ -1211,14 +1211,6 @@
.children = { &asterisk_config,&asterisk_info,&asterisk_modules,&asterisk_logging,&asterisk_variable, }
};
-static int load_module(void)
-{
- int res = 0;
- stasis_app_ref();
- res |= ast_ari_add_handler(&asterisk);
- return res;
-}
-
static int unload_module(void)
{
ast_ari_remove_handler(&asterisk);
@@ -1226,6 +1218,19 @@
return 0;
}
+static int load_module(void)
+{
+ int res = 0;
+ stasis_app_ref();
+ res |= ast_ari_add_handler(&asterisk);
+ if (res) {
+ unload_module();
+ return AST_MODULE_LOAD_DECLINE;
+ }
+
+ return AST_MODULE_LOAD_SUCCESS;
+}
+
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Asterisk resources",
.support_level = AST_MODULE_SUPPORT_CORE,
.load = load_module,
diff --git a/res/res_ari_bridges.c b/res/res_ari_bridges.c
index e61865e..5402c2b 100644
--- a/res/res_ari_bridges.c
+++ b/res/res_ari_bridges.c
@@ -1537,14 +1537,6 @@
.children = { &bridges_bridgeId, }
};
-static int load_module(void)
-{
- int res = 0;
- stasis_app_ref();
- res |= ast_ari_add_handler(&bridges);
- return res;
-}
-
static int unload_module(void)
{
ast_ari_remove_handler(&bridges);
@@ -1552,6 +1544,19 @@
return 0;
}
+static int load_module(void)
+{
+ int res = 0;
+ stasis_app_ref();
+ res |= ast_ari_add_handler(&bridges);
+ if (res) {
+ unload_module();
+ return AST_MODULE_LOAD_DECLINE;
+ }
+
+ return AST_MODULE_LOAD_SUCCESS;
+}
+
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Bridge resources",
.support_level = AST_MODULE_SUPPORT_CORE,
.load = load_module,
diff --git a/res/res_ari_channels.c b/res/res_ari_channels.c
index 739eb01..9d218e2 100644
--- a/res/res_ari_channels.c
+++ b/res/res_ari_channels.c
@@ -2841,14 +2841,6 @@
.children = { &channels_create,&channels_channelId, }
};
-static int load_module(void)
-{
- int res = 0;
- stasis_app_ref();
- res |= ast_ari_add_handler(&channels);
- return res;
-}
-
static int unload_module(void)
{
ast_ari_remove_handler(&channels);
@@ -2856,6 +2848,19 @@
return 0;
}
+static int load_module(void)
+{
+ int res = 0;
+ stasis_app_ref();
+ res |= ast_ari_add_handler(&channels);
+ if (res) {
+ unload_module();
+ return AST_MODULE_LOAD_DECLINE;
+ }
+
+ return AST_MODULE_LOAD_SUCCESS;
+}
+
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Channel resources",
.support_level = AST_MODULE_SUPPORT_CORE,
.load = load_module,
diff --git a/res/res_ari_device_states.c b/res/res_ari_device_states.c
index b2aea52..d6de5df 100644
--- a/res/res_ari_device_states.c
+++ b/res/res_ari_device_states.c
@@ -321,14 +321,6 @@
.children = { &deviceStates_deviceName, }
};
-static int load_module(void)
-{
- int res = 0;
- stasis_app_ref();
- res |= ast_ari_add_handler(&deviceStates);
- return res;
-}
-
static int unload_module(void)
{
ast_ari_remove_handler(&deviceStates);
@@ -336,6 +328,19 @@
return 0;
}
+static int load_module(void)
+{
+ int res = 0;
+ stasis_app_ref();
+ res |= ast_ari_add_handler(&deviceStates);
+ if (res) {
+ unload_module();
+ return AST_MODULE_LOAD_DECLINE;
+ }
+
+ return AST_MODULE_LOAD_SUCCESS;
+}
+
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Device state resources",
.support_level = AST_MODULE_SUPPORT_CORE,
.load = load_module,
diff --git a/res/res_ari_endpoints.c b/res/res_ari_endpoints.c
index 944146f..d96de08 100644
--- a/res/res_ari_endpoints.c
+++ b/res/res_ari_endpoints.c
@@ -445,14 +445,6 @@
.children = { &endpoints_sendMessage,&endpoints_tech, }
};
-static int load_module(void)
-{
- int res = 0;
- stasis_app_ref();
- res |= ast_ari_add_handler(&endpoints);
- return res;
-}
-
static int unload_module(void)
{
ast_ari_remove_handler(&endpoints);
@@ -460,6 +452,19 @@
return 0;
}
+static int load_module(void)
+{
+ int res = 0;
+ stasis_app_ref();
+ res |= ast_ari_add_handler(&endpoints);
+ if (res) {
+ unload_module();
+ return AST_MODULE_LOAD_DECLINE;
+ }
+
+ return AST_MODULE_LOAD_SUCCESS;
+}
+
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Endpoint resources",
.support_level = AST_MODULE_SUPPORT_CORE,
.load = load_module,
diff --git a/res/res_ari_events.c b/res/res_ari_events.c
index 76b7917..3f5b89a 100644
--- a/res/res_ari_events.c
+++ b/res/res_ari_events.c
@@ -454,7 +454,6 @@
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 2eac609..12c33cd 100644
--- a/res/res_ari_mailboxes.c
+++ b/res/res_ari_mailboxes.c
@@ -327,14 +327,6 @@
.children = { &mailboxes_mailboxName, }
};
-static int load_module(void)
-{
- int res = 0;
- stasis_app_ref();
- res |= ast_ari_add_handler(&mailboxes);
- return res;
-}
-
static int unload_module(void)
{
ast_ari_remove_handler(&mailboxes);
@@ -342,6 +334,19 @@
return 0;
}
+static int load_module(void)
+{
+ int res = 0;
+ stasis_app_ref();
+ res |= ast_ari_add_handler(&mailboxes);
+ if (res) {
+ unload_module();
+ return AST_MODULE_LOAD_DECLINE;
+ }
+
+ return AST_MODULE_LOAD_SUCCESS;
+}
+
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Mailboxes resources",
.support_level = AST_MODULE_SUPPORT_CORE,
.load = load_module,
diff --git a/res/res_ari_playbacks.c b/res/res_ari_playbacks.c
index 8267a91..e2c432d 100644
--- a/res/res_ari_playbacks.c
+++ b/res/res_ari_playbacks.c
@@ -279,14 +279,6 @@
.children = { &playbacks_playbackId, }
};
-static int load_module(void)
-{
- int res = 0;
- stasis_app_ref();
- res |= ast_ari_add_handler(&playbacks);
- return res;
-}
-
static int unload_module(void)
{
ast_ari_remove_handler(&playbacks);
@@ -294,6 +286,19 @@
return 0;
}
+static int load_module(void)
+{
+ int res = 0;
+ stasis_app_ref();
+ res |= ast_ari_add_handler(&playbacks);
+ if (res) {
+ unload_module();
+ return AST_MODULE_LOAD_DECLINE;
+ }
+
+ return AST_MODULE_LOAD_SUCCESS;
+}
+
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Playback control resources",
.support_level = AST_MODULE_SUPPORT_CORE,
.load = load_module,
diff --git a/res/res_ari_recordings.c b/res/res_ari_recordings.c
index e82605c..57d80f2 100644
--- a/res/res_ari_recordings.c
+++ b/res/res_ari_recordings.c
@@ -863,14 +863,6 @@
.children = { &recordings_stored,&recordings_live, }
};
-static int load_module(void)
-{
- int res = 0;
- stasis_app_ref();
- res |= ast_ari_add_handler(&recordings);
- return res;
-}
-
static int unload_module(void)
{
ast_ari_remove_handler(&recordings);
@@ -878,6 +870,19 @@
return 0;
}
+static int load_module(void)
+{
+ int res = 0;
+ stasis_app_ref();
+ res |= ast_ari_add_handler(&recordings);
+ if (res) {
+ unload_module();
+ return AST_MODULE_LOAD_DECLINE;
+ }
+
+ return AST_MODULE_LOAD_SUCCESS;
+}
+
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Recording resources",
.support_level = AST_MODULE_SUPPORT_CORE,
.load = load_module,
diff --git a/res/res_ari_sounds.c b/res/res_ari_sounds.c
index fe0692f..fded7fb 100644
--- a/res/res_ari_sounds.c
+++ b/res/res_ari_sounds.c
@@ -209,14 +209,6 @@
.children = { &sounds_soundId, }
};
-static int load_module(void)
-{
- int res = 0;
- stasis_app_ref();
- res |= ast_ari_add_handler(&sounds);
- return res;
-}
-
static int unload_module(void)
{
ast_ari_remove_handler(&sounds);
@@ -224,6 +216,19 @@
return 0;
}
+static int load_module(void)
+{
+ int res = 0;
+ stasis_app_ref();
+ res |= ast_ari_add_handler(&sounds);
+ if (res) {
+ unload_module();
+ return AST_MODULE_LOAD_DECLINE;
+ }
+
+ return AST_MODULE_LOAD_SUCCESS;
+}
+
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Sound resources",
.support_level = AST_MODULE_SUPPORT_CORE,
.load = load_module,
--
To view, visit https://gerrit.asterisk.org/5495
To unsubscribe, visit https://gerrit.asterisk.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I94b97035311eccf52b0101b8590223265a7881d4
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Mark Michelson <mmichelson at digium.com>
Gerrit-Reviewer: Richard Mudgett <rmudgett at digium.com>
More information about the asterisk-code-review
mailing list