[svn-commits] dlee: branch dlee/allow-multiple r395454 - in /team/dlee/allow-multiple: res/...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Thu Jul 25 15:18:26 CDT 2013
Author: dlee
Date: Thu Jul 25 15:18:24 2013
New Revision: 395454
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=395454
Log:
Patch minimizing
Modified:
team/dlee/allow-multiple/res/res_stasis_http_asterisk.c
team/dlee/allow-multiple/res/res_stasis_http_bridges.c
team/dlee/allow-multiple/res/res_stasis_http_channels.c
team/dlee/allow-multiple/res/res_stasis_http_endpoints.c
team/dlee/allow-multiple/res/res_stasis_http_events.c
team/dlee/allow-multiple/res/res_stasis_http_playback.c
team/dlee/allow-multiple/res/res_stasis_http_recordings.c
team/dlee/allow-multiple/res/res_stasis_http_sounds.c
team/dlee/allow-multiple/rest-api-templates/param_parsing.mustache
team/dlee/allow-multiple/rest-api-templates/res_stasis_http_resource.c.mustache
Modified: team/dlee/allow-multiple/res/res_stasis_http_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/allow-multiple/res/res_stasis_http_asterisk.c?view=diff&rev=395454&r1=395453&r2=395454
==============================================================================
--- team/dlee/allow-multiple/res/res_stasis_http_asterisk.c (original)
+++ team/dlee/allow-multiple/res/res_stasis_http_asterisk.c Thu Jul 25 15:18:24 2013
@@ -104,11 +104,10 @@
for (j = 0; j < args.only_count; ++j) {
args.only[j] = (vals[j]);
}
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
{}
}
stasis_http_get_asterisk_info(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -163,11 +162,10 @@
for (i = get_params; i; i = i->next) {
if (strcmp(i->name, "variable") == 0) {
args.variable = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
{}
}
stasis_http_get_global_var(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -220,14 +218,13 @@
for (i = get_params; i; i = i->next) {
if (strcmp(i->name, "variable") == 0) {
args.variable = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
if (strcmp(i->name, "value") == 0) {
args.value = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
{}
}
stasis_http_set_global_var(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
Modified: team/dlee/allow-multiple/res/res_stasis_http_bridges.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/allow-multiple/res/res_stasis_http_bridges.c?view=diff&rev=395454&r1=395453&r2=395454
==============================================================================
--- team/dlee/allow-multiple/res/res_stasis_http_bridges.c (original)
+++ team/dlee/allow-multiple/res/res_stasis_http_bridges.c Thu Jul 25 15:18:24 2013
@@ -69,7 +69,6 @@
#endif /* AST_DEVMODE */
stasis_http_get_bridges(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -122,11 +121,10 @@
for (i = get_params; i; i = i->next) {
if (strcmp(i->name, "type") == 0) {
args.type = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
{}
}
stasis_http_new_bridge(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -179,11 +177,10 @@
for (i = path_vars; i; i = i->next) {
if (strcmp(i->name, "bridgeId") == 0) {
args.bridge_id = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
{}
}
stasis_http_get_bridge(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -237,11 +234,10 @@
for (i = path_vars; i; i = i->next) {
if (strcmp(i->name, "bridgeId") == 0) {
args.bridge_id = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
{}
}
stasis_http_delete_bridge(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -327,17 +323,16 @@
for (j = 0; j < args.channel_count; ++j) {
args.channel[j] = (vals[j]);
}
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
{}
}
for (i = path_vars; i; i = i->next) {
if (strcmp(i->name, "bridgeId") == 0) {
args.bridge_id = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
{}
}
stasis_http_add_channel_to_bridge(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -427,17 +422,16 @@
for (j = 0; j < args.channel_count; ++j) {
args.channel[j] = (vals[j]);
}
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
{}
}
for (i = path_vars; i; i = i->next) {
if (strcmp(i->name, "bridgeId") == 0) {
args.bridge_id = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
{}
}
stasis_http_remove_channel_from_bridge(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -492,26 +486,25 @@
for (i = get_params; i; i = i->next) {
if (strcmp(i->name, "media") == 0) {
args.media = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
if (strcmp(i->name, "lang") == 0) {
args.lang = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
if (strcmp(i->name, "offsetms") == 0) {
args.offsetms = atoi(i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
if (strcmp(i->name, "skipms") == 0) {
args.skipms = atoi(i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
{}
}
for (i = path_vars; i; i = i->next) {
if (strcmp(i->name, "bridgeId") == 0) {
args.bridge_id = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
{}
}
stasis_http_play_on_bridge(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -566,35 +559,34 @@
for (i = get_params; i; i = i->next) {
if (strcmp(i->name, "name") == 0) {
args.name = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
if (strcmp(i->name, "format") == 0) {
args.format = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
if (strcmp(i->name, "maxDurationSeconds") == 0) {
args.max_duration_seconds = atoi(i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
if (strcmp(i->name, "maxSilenceSeconds") == 0) {
args.max_silence_seconds = atoi(i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
if (strcmp(i->name, "ifExists") == 0) {
args.if_exists = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
if (strcmp(i->name, "beep") == 0) {
args.beep = ast_true(i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
if (strcmp(i->name, "terminateOn") == 0) {
args.terminate_on = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
{}
}
for (i = path_vars; i; i = i->next) {
if (strcmp(i->name, "bridgeId") == 0) {
args.bridge_id = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
{}
}
stasis_http_record_bridge(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
Modified: team/dlee/allow-multiple/res/res_stasis_http_channels.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/allow-multiple/res/res_stasis_http_channels.c?view=diff&rev=395454&r1=395453&r2=395454
==============================================================================
--- team/dlee/allow-multiple/res/res_stasis_http_channels.c (original)
+++ team/dlee/allow-multiple/res/res_stasis_http_channels.c Thu Jul 25 15:18:24 2013
@@ -69,7 +69,6 @@
#endif /* AST_DEVMODE */
stasis_http_get_channels(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -122,32 +121,31 @@
for (i = get_params; i; i = i->next) {
if (strcmp(i->name, "endpoint") == 0) {
args.endpoint = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
if (strcmp(i->name, "extension") == 0) {
args.extension = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
if (strcmp(i->name, "context") == 0) {
args.context = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
if (strcmp(i->name, "priority") == 0) {
args.priority = atol(i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
if (strcmp(i->name, "app") == 0) {
args.app = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
if (strcmp(i->name, "appArgs") == 0) {
args.app_args = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
if (strcmp(i->name, "callerId") == 0) {
args.caller_id = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
if (strcmp(i->name, "timeout") == 0) {
args.timeout = atoi(i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
{}
}
stasis_http_originate(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -201,11 +199,10 @@
for (i = path_vars; i; i = i->next) {
if (strcmp(i->name, "channelId") == 0) {
args.channel_id = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
{}
}
stasis_http_get_channel(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -259,11 +256,10 @@
for (i = path_vars; i; i = i->next) {
if (strcmp(i->name, "channelId") == 0) {
args.channel_id = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
{}
}
stasis_http_delete_channel(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -317,26 +313,25 @@
for (i = get_params; i; i = i->next) {
if (strcmp(i->name, "endpoint") == 0) {
args.endpoint = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
if (strcmp(i->name, "extension") == 0) {
args.extension = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
if (strcmp(i->name, "context") == 0) {
args.context = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
if (strcmp(i->name, "timeout") == 0) {
args.timeout = atoi(i->value);
- } else /* Looks weird, but makes the codegen much simpler */
- {}
- }
- for (i = path_vars; i; i = i->next) {
- if (strcmp(i->name, "channelId") == 0) {
- args.channel_id = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
+ {}
+ }
+ for (i = path_vars; i; i = i->next) {
+ if (strcmp(i->name, "channelId") == 0) {
+ args.channel_id = (i->value);
+ } else
{}
}
stasis_http_dial(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -391,23 +386,22 @@
for (i = get_params; i; i = i->next) {
if (strcmp(i->name, "context") == 0) {
args.context = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
if (strcmp(i->name, "extension") == 0) {
args.extension = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
if (strcmp(i->name, "priority") == 0) {
args.priority = atoi(i->value);
- } else /* Looks weird, but makes the codegen much simpler */
- {}
- }
- for (i = path_vars; i; i = i->next) {
- if (strcmp(i->name, "channelId") == 0) {
- args.channel_id = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
+ {}
+ }
+ for (i = path_vars; i; i = i->next) {
+ if (strcmp(i->name, "channelId") == 0) {
+ args.channel_id = (i->value);
+ } else
{}
}
stasis_http_continue_in_dialplan(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -462,11 +456,10 @@
for (i = path_vars; i; i = i->next) {
if (strcmp(i->name, "channelId") == 0) {
args.channel_id = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
{}
}
stasis_http_answer_channel(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -521,17 +514,16 @@
for (i = get_params; i; i = i->next) {
if (strcmp(i->name, "direction") == 0) {
args.direction = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
- {}
- }
- for (i = path_vars; i; i = i->next) {
- if (strcmp(i->name, "channelId") == 0) {
- args.channel_id = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
+ {}
+ }
+ for (i = path_vars; i; i = i->next) {
+ if (strcmp(i->name, "channelId") == 0) {
+ args.channel_id = (i->value);
+ } else
{}
}
stasis_http_mute_channel(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -586,17 +578,16 @@
for (i = get_params; i; i = i->next) {
if (strcmp(i->name, "direction") == 0) {
args.direction = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
- {}
- }
- for (i = path_vars; i; i = i->next) {
- if (strcmp(i->name, "channelId") == 0) {
- args.channel_id = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
+ {}
+ }
+ for (i = path_vars; i; i = i->next) {
+ if (strcmp(i->name, "channelId") == 0) {
+ args.channel_id = (i->value);
+ } else
{}
}
stasis_http_unmute_channel(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -651,11 +642,10 @@
for (i = path_vars; i; i = i->next) {
if (strcmp(i->name, "channelId") == 0) {
args.channel_id = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
{}
}
stasis_http_hold_channel(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -710,11 +700,10 @@
for (i = path_vars; i; i = i->next) {
if (strcmp(i->name, "channelId") == 0) {
args.channel_id = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
{}
}
stasis_http_unhold_channel(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -769,17 +758,16 @@
for (i = get_params; i; i = i->next) {
if (strcmp(i->name, "mohClass") == 0) {
args.moh_class = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
- {}
- }
- for (i = path_vars; i; i = i->next) {
- if (strcmp(i->name, "channelId") == 0) {
- args.channel_id = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
+ {}
+ }
+ for (i = path_vars; i; i = i->next) {
+ if (strcmp(i->name, "channelId") == 0) {
+ args.channel_id = (i->value);
+ } else
{}
}
stasis_http_moh_start_channel(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -834,11 +822,10 @@
for (i = path_vars; i; i = i->next) {
if (strcmp(i->name, "channelId") == 0) {
args.channel_id = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
{}
}
stasis_http_moh_stop_channel(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -893,26 +880,25 @@
for (i = get_params; i; i = i->next) {
if (strcmp(i->name, "media") == 0) {
args.media = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
if (strcmp(i->name, "lang") == 0) {
args.lang = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
if (strcmp(i->name, "offsetms") == 0) {
args.offsetms = atoi(i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
if (strcmp(i->name, "skipms") == 0) {
args.skipms = atoi(i->value);
- } else /* Looks weird, but makes the codegen much simpler */
- {}
- }
- for (i = path_vars; i; i = i->next) {
- if (strcmp(i->name, "channelId") == 0) {
- args.channel_id = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
+ {}
+ }
+ for (i = path_vars; i; i = i->next) {
+ if (strcmp(i->name, "channelId") == 0) {
+ args.channel_id = (i->value);
+ } else
{}
}
stasis_http_play_on_channel(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -967,35 +953,34 @@
for (i = get_params; i; i = i->next) {
if (strcmp(i->name, "name") == 0) {
args.name = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
if (strcmp(i->name, "format") == 0) {
args.format = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
if (strcmp(i->name, "maxDurationSeconds") == 0) {
args.max_duration_seconds = atoi(i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
if (strcmp(i->name, "maxSilenceSeconds") == 0) {
args.max_silence_seconds = atoi(i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
if (strcmp(i->name, "ifExists") == 0) {
args.if_exists = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
if (strcmp(i->name, "beep") == 0) {
args.beep = ast_true(i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
if (strcmp(i->name, "terminateOn") == 0) {
args.terminate_on = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
- {}
- }
- for (i = path_vars; i; i = i->next) {
- if (strcmp(i->name, "channelId") == 0) {
- args.channel_id = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
+ {}
+ }
+ for (i = path_vars; i; i = i->next) {
+ if (strcmp(i->name, "channelId") == 0) {
+ args.channel_id = (i->value);
+ } else
{}
}
stasis_http_record_channel(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -1051,17 +1036,16 @@
for (i = get_params; i; i = i->next) {
if (strcmp(i->name, "variable") == 0) {
args.variable = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
- {}
- }
- for (i = path_vars; i; i = i->next) {
- if (strcmp(i->name, "channelId") == 0) {
- args.channel_id = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
+ {}
+ }
+ for (i = path_vars; i; i = i->next) {
+ if (strcmp(i->name, "channelId") == 0) {
+ args.channel_id = (i->value);
+ } else
{}
}
stasis_http_get_channel_var(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -1116,20 +1100,19 @@
for (i = get_params; i; i = i->next) {
if (strcmp(i->name, "variable") == 0) {
args.variable = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
if (strcmp(i->name, "value") == 0) {
args.value = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
- {}
- }
- for (i = path_vars; i; i = i->next) {
- if (strcmp(i->name, "channelId") == 0) {
- args.channel_id = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
+ {}
+ }
+ for (i = path_vars; i; i = i->next) {
+ if (strcmp(i->name, "channelId") == 0) {
+ args.channel_id = (i->value);
+ } else
{}
}
stasis_http_set_channel_var(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
Modified: team/dlee/allow-multiple/res/res_stasis_http_endpoints.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/allow-multiple/res/res_stasis_http_endpoints.c?view=diff&rev=395454&r1=395453&r2=395454
==============================================================================
--- team/dlee/allow-multiple/res/res_stasis_http_endpoints.c (original)
+++ team/dlee/allow-multiple/res/res_stasis_http_endpoints.c Thu Jul 25 15:18:24 2013
@@ -69,7 +69,6 @@
#endif /* AST_DEVMODE */
stasis_http_get_endpoints(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -122,11 +121,10 @@
for (i = path_vars; i; i = i->next) {
if (strcmp(i->name, "tech") == 0) {
args.tech = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
{}
}
stasis_http_get_endpoints_by_tech(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -179,14 +177,13 @@
for (i = path_vars; i; i = i->next) {
if (strcmp(i->name, "tech") == 0) {
args.tech = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
if (strcmp(i->name, "resource") == 0) {
args.resource = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
{}
}
stasis_http_get_endpoint(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
Modified: team/dlee/allow-multiple/res/res_stasis_http_events.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/allow-multiple/res/res_stasis_http_events.c?view=diff&rev=395454&r1=395453&r2=395454
==============================================================================
--- team/dlee/allow-multiple/res/res_stasis_http_events.c (original)
+++ team/dlee/allow-multiple/res/res_stasis_http_events.c Thu Jul 25 15:18:24 2013
@@ -112,7 +112,7 @@
for (j = 0; j < args.app_count; ++j) {
args.app[j] = (vals[j]);
}
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
{}
}
Modified: team/dlee/allow-multiple/res/res_stasis_http_playback.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/allow-multiple/res/res_stasis_http_playback.c?view=diff&rev=395454&r1=395453&r2=395454
==============================================================================
--- team/dlee/allow-multiple/res/res_stasis_http_playback.c (original)
+++ team/dlee/allow-multiple/res/res_stasis_http_playback.c Thu Jul 25 15:18:24 2013
@@ -72,11 +72,10 @@
for (i = path_vars; i; i = i->next) {
if (strcmp(i->name, "playbackId") == 0) {
args.playback_id = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
{}
}
stasis_http_get_playback(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -129,11 +128,10 @@
for (i = path_vars; i; i = i->next) {
if (strcmp(i->name, "playbackId") == 0) {
args.playback_id = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
{}
}
stasis_http_stop_playback(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -186,17 +184,16 @@
for (i = get_params; i; i = i->next) {
if (strcmp(i->name, "operation") == 0) {
args.operation = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
{}
}
for (i = path_vars; i; i = i->next) {
if (strcmp(i->name, "playbackId") == 0) {
args.playback_id = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
{}
}
stasis_http_control_playback(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
Modified: team/dlee/allow-multiple/res/res_stasis_http_recordings.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/allow-multiple/res/res_stasis_http_recordings.c?view=diff&rev=395454&r1=395453&r2=395454
==============================================================================
--- team/dlee/allow-multiple/res/res_stasis_http_recordings.c (original)
+++ team/dlee/allow-multiple/res/res_stasis_http_recordings.c Thu Jul 25 15:18:24 2013
@@ -69,7 +69,6 @@
#endif /* AST_DEVMODE */
stasis_http_get_stored_recordings(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -122,11 +121,10 @@
for (i = path_vars; i; i = i->next) {
if (strcmp(i->name, "recordingName") == 0) {
args.recording_name = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
{}
}
stasis_http_get_stored_recording(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -179,11 +177,10 @@
for (i = path_vars; i; i = i->next) {
if (strcmp(i->name, "recordingName") == 0) {
args.recording_name = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
{}
}
stasis_http_delete_stored_recording(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -233,7 +230,6 @@
#endif /* AST_DEVMODE */
stasis_http_get_live_recordings(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -286,11 +282,10 @@
for (i = path_vars; i; i = i->next) {
if (strcmp(i->name, "recordingName") == 0) {
args.recording_name = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
{}
}
stasis_http_get_live_recording(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -343,11 +338,10 @@
for (i = path_vars; i; i = i->next) {
if (strcmp(i->name, "recordingName") == 0) {
args.recording_name = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
{}
}
stasis_http_cancel_recording(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -400,11 +394,10 @@
for (i = path_vars; i; i = i->next) {
if (strcmp(i->name, "recordingName") == 0) {
args.recording_name = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
{}
}
stasis_http_stop_recording(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -457,11 +450,10 @@
for (i = path_vars; i; i = i->next) {
if (strcmp(i->name, "recordingName") == 0) {
args.recording_name = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
{}
}
stasis_http_pause_recording(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -514,11 +506,10 @@
for (i = path_vars; i; i = i->next) {
if (strcmp(i->name, "recordingName") == 0) {
args.recording_name = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
{}
}
stasis_http_unpause_recording(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -571,11 +562,10 @@
for (i = path_vars; i; i = i->next) {
if (strcmp(i->name, "recordingName") == 0) {
args.recording_name = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
{}
}
stasis_http_mute_recording(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -628,11 +618,10 @@
for (i = path_vars; i; i = i->next) {
if (strcmp(i->name, "recordingName") == 0) {
args.recording_name = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
{}
}
stasis_http_unmute_recording(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
Modified: team/dlee/allow-multiple/res/res_stasis_http_sounds.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/allow-multiple/res/res_stasis_http_sounds.c?view=diff&rev=395454&r1=395453&r2=395454
==============================================================================
--- team/dlee/allow-multiple/res/res_stasis_http_sounds.c (original)
+++ team/dlee/allow-multiple/res/res_stasis_http_sounds.c Thu Jul 25 15:18:24 2013
@@ -72,14 +72,13 @@
for (i = get_params; i; i = i->next) {
if (strcmp(i->name, "lang") == 0) {
args.lang = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
if (strcmp(i->name, "format") == 0) {
args.format = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
{}
}
stasis_http_get_sounds(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -132,11 +131,10 @@
for (i = path_vars; i; i = i->next) {
if (strcmp(i->name, "soundId") == 0) {
args.sound_id = (i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
{}
}
stasis_http_get_stored_sound(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
Modified: team/dlee/allow-multiple/rest-api-templates/param_parsing.mustache
URL: http://svnview.digium.com/svn/asterisk/team/dlee/allow-multiple/rest-api-templates/param_parsing.mustache?view=diff&rev=395454&r1=395453&r2=395454
==============================================================================
--- team/dlee/allow-multiple/rest-api-templates/param_parsing.mustache (original)
+++ team/dlee/allow-multiple/rest-api-templates/param_parsing.mustache Thu Jul 25 15:18:24 2013
@@ -60,7 +60,7 @@
args.{{c_name}}[j] = {{c_convert}}(vals[j]);
}
{{/allow_multiple}}
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
{{/query_parameters}}
{}
}
@@ -70,7 +70,7 @@
{{#path_parameters}}
if (strcmp(i->name, "{{name}}") == 0) {
args.{{c_name}} = {{c_convert}}(i->value);
- } else /* Looks weird, but makes the codegen much simpler */
+ } else
{{/path_parameters}}
{}
}
Modified: team/dlee/allow-multiple/rest-api-templates/res_stasis_http_resource.c.mustache
URL: http://svnview.digium.com/svn/asterisk/team/dlee/allow-multiple/rest-api-templates/res_stasis_http_resource.c.mustache?view=diff&rev=395454&r1=395453&r2=395454
==============================================================================
--- team/dlee/allow-multiple/rest-api-templates/res_stasis_http_resource.c.mustache (original)
+++ team/dlee/allow-multiple/rest-api-templates/res_stasis_http_resource.c.mustache Thu Jul 25 15:18:24 2013
@@ -81,7 +81,6 @@
{{> param_parsing}}
stasis_http_{{c_nickname}}(headers, &args, response);
-
#if defined(AST_DEVMODE)
code = response->response_code;
More information about the svn-commits
mailing list