summaryrefslogtreecommitdiff
path: root/res/res_ari_sounds.c
diff options
context:
space:
mode:
authorDavid M. Lee <dlee@digium.com>2013-11-07 21:10:31 +0000
committerDavid M. Lee <dlee@digium.com>2013-11-07 21:10:31 +0000
commit7d0d1a1efb1d484cce28137f1abc1a6ece61d7e9 (patch)
treea61c7891a423ff7a70ae5bb3a5880ba4437702fd /res/res_ari_sounds.c
parentcdfbc02df164a9bc49e23900fae66e696c4623aa (diff)
ari: User better nicknames for ARI operations
While working on building client libraries from the Swagger API, I noticed a problem with the nicknames. channel.deleteChannel() channel.answerChannel() channel.muteChannel() Etc. We put the object name in the nickname (since we were generating C code), but it makes OO generators redundant. This patch makes the nicknames more OO friendly. This resulted in a lot of name changing within the res_ari_*.so modules, but not much else. There were a couple of other fixed I made in the process. * When reversible operations (POST /hold, POST /unhold) were made more RESTful (POST /hold, DELETE /unhold), the path for the second operation was left in the API declaration. This worked, but really the two operations should have been on the same API. * The POST /unmute operation had still not been REST-ified. Review: https://reviewboard.asterisk.org/r/2940/ ........ Merged revisions 402528 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@402529 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_ari_sounds.c')
-rw-r--r--res/res_ari_sounds.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/res/res_ari_sounds.c b/res/res_ari_sounds.c
index 0b817c309..62a34364e 100644
--- a/res/res_ari_sounds.c
+++ b/res/res_ari_sounds.c
@@ -58,11 +58,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void ast_ari_get_sounds_cb(
+static void ast_ari_sounds_list_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct ast_ari_response *response)
{
- struct ast_get_sounds_args args = {};
+ struct ast_ari_sounds_list_args args = {};
struct ast_variable *i;
#if defined(AST_DEVMODE)
int is_valid;
@@ -78,7 +78,7 @@ static void ast_ari_get_sounds_cb(
} else
{}
}
- ast_ari_get_sounds(headers, &args, response);
+ ast_ari_sounds_list(headers, &args, response);
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -117,11 +117,11 @@ fin: __attribute__((unused))
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void ast_ari_get_stored_sound_cb(
+static void ast_ari_sounds_get_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct ast_ari_response *response)
{
- struct ast_get_stored_sound_args args = {};
+ struct ast_ari_sounds_get_args args = {};
struct ast_variable *i;
#if defined(AST_DEVMODE)
int is_valid;
@@ -134,7 +134,7 @@ static void ast_ari_get_stored_sound_cb(
} else
{}
}
- ast_ari_get_stored_sound(headers, &args, response);
+ ast_ari_sounds_get(headers, &args, response);
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -172,7 +172,7 @@ static struct stasis_rest_handlers sounds_soundId = {
.path_segment = "soundId",
.is_wildcard = 1,
.callbacks = {
- [AST_HTTP_GET] = ast_ari_get_stored_sound_cb,
+ [AST_HTTP_GET] = ast_ari_sounds_get_cb,
},
.num_children = 0,
.children = { }
@@ -181,7 +181,7 @@ static struct stasis_rest_handlers sounds_soundId = {
static struct stasis_rest_handlers sounds = {
.path_segment = "sounds",
.callbacks = {
- [AST_HTTP_GET] = ast_ari_get_sounds_cb,
+ [AST_HTTP_GET] = ast_ari_sounds_list_cb,
},
.num_children = 1,
.children = { &sounds_soundId, }