[svn-commits] dlee: branch dlee/ASTERISK-22685-json-body r402455 - in /team/dlee/ASTERISK-2...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Mon Nov 4 15:14:50 CST 2013
Author: dlee
Date: Mon Nov 4 15:14:48 2013
New Revision: 402455
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=402455
Log:
Comments and whitespace
Modified:
team/dlee/ASTERISK-22685-json-body/main/http.c
team/dlee/ASTERISK-22685-json-body/res/res_ari_applications.c
team/dlee/ASTERISK-22685-json-body/res/res_ari_asterisk.c
team/dlee/ASTERISK-22685-json-body/res/res_ari_bridges.c
team/dlee/ASTERISK-22685-json-body/res/res_ari_channels.c
team/dlee/ASTERISK-22685-json-body/res/res_ari_endpoints.c
team/dlee/ASTERISK-22685-json-body/res/res_ari_events.c
team/dlee/ASTERISK-22685-json-body/res/res_ari_playback.c
team/dlee/ASTERISK-22685-json-body/res/res_ari_recordings.c
team/dlee/ASTERISK-22685-json-body/res/res_ari_sounds.c
team/dlee/ASTERISK-22685-json-body/rest-api-templates/param_parsing.mustache
Modified: team/dlee/ASTERISK-22685-json-body/main/http.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ASTERISK-22685-json-body/main/http.c?view=diff&rev=402455&r1=402454&r2=402455
==============================================================================
--- team/dlee/ASTERISK-22685-json-body/main/http.c (original)
+++ team/dlee/ASTERISK-22685-json-body/main/http.c Mon Nov 4 15:14:48 2013
@@ -650,6 +650,7 @@
buf = ast_malloc(content_length);
if (!buf) {
+ /* Malloc sets ENOMEM */
return NULL;
}
Modified: team/dlee/ASTERISK-22685-json-body/res/res_ari_applications.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ASTERISK-22685-json-body/res/res_ari_applications.c?view=diff&rev=402455&r1=402454&r2=402455
==============================================================================
--- team/dlee/ASTERISK-22685-json-body/res/res_ari_applications.c (original)
+++ team/dlee/ASTERISK-22685-json-body/res/res_ari_applications.c Mon Nov 4 15:14:48 2013
@@ -70,7 +70,6 @@
int code;
#endif /* AST_DEVMODE */
-
ast_ari_get_applications(headers, &args, response);
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -129,7 +128,6 @@
} else
{}
}
-
ast_ari_get_application(headers, &args, response);
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -236,7 +234,6 @@
} else
{}
}
-
/* Look for a JSON request entity */
body = ast_http_get_json(ser, headers);
if (!body) {
@@ -387,7 +384,6 @@
} else
{}
}
-
/* Look for a JSON request entity */
body = ast_http_get_json(ser, headers);
if (!body) {
Modified: team/dlee/ASTERISK-22685-json-body/res/res_ari_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ASTERISK-22685-json-body/res/res_ari_asterisk.c?view=diff&rev=402455&r1=402454&r2=402455
==============================================================================
--- team/dlee/ASTERISK-22685-json-body/res/res_ari_asterisk.c (original)
+++ team/dlee/ASTERISK-22685-json-body/res/res_ari_asterisk.c Mon Nov 4 15:14:48 2013
@@ -118,7 +118,6 @@
} else
{}
}
-
/* Look for a JSON request entity */
body = ast_http_get_json(ser, headers);
if (!body) {
@@ -220,7 +219,6 @@
} else
{}
}
-
/* Look for a JSON request entity */
body = ast_http_get_json(ser, headers);
if (!body) {
@@ -304,7 +302,6 @@
} else
{}
}
-
/* Look for a JSON request entity */
body = ast_http_get_json(ser, headers);
if (!body) {
Modified: team/dlee/ASTERISK-22685-json-body/res/res_ari_bridges.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ASTERISK-22685-json-body/res/res_ari_bridges.c?view=diff&rev=402455&r1=402454&r2=402455
==============================================================================
--- team/dlee/ASTERISK-22685-json-body/res/res_ari_bridges.c (original)
+++ team/dlee/ASTERISK-22685-json-body/res/res_ari_bridges.c Mon Nov 4 15:14:48 2013
@@ -70,7 +70,6 @@
int code;
#endif /* AST_DEVMODE */
-
ast_ari_get_bridges(headers, &args, response);
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -130,7 +129,6 @@
} else
{}
}
-
/* Look for a JSON request entity */
body = ast_http_get_json(ser, headers);
if (!body) {
@@ -209,7 +207,6 @@
} else
{}
}
-
ast_ari_get_bridge(headers, &args, response);
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -269,7 +266,6 @@
} else
{}
}
-
ast_ari_delete_bridge(headers, &args, response);
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -379,7 +375,6 @@
} else
{}
}
-
/* Look for a JSON request entity */
body = ast_http_get_json(ser, headers);
if (!body) {
@@ -535,7 +530,6 @@
} else
{}
}
-
/* Look for a JSON request entity */
body = ast_http_get_json(ser, headers);
if (!body) {
@@ -647,7 +641,6 @@
} else
{}
}
-
/* Look for a JSON request entity */
body = ast_http_get_json(ser, headers);
if (!body) {
@@ -728,7 +721,6 @@
} else
{}
}
-
ast_ari_moh_stop_bridge(headers, &args, response);
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -805,7 +797,6 @@
} else
{}
}
-
/* Look for a JSON request entity */
body = ast_http_get_json(ser, headers);
if (!body) {
@@ -923,7 +914,6 @@
} else
{}
}
-
/* Look for a JSON request entity */
body = ast_http_get_json(ser, headers);
if (!body) {
Modified: team/dlee/ASTERISK-22685-json-body/res/res_ari_channels.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ASTERISK-22685-json-body/res/res_ari_channels.c?view=diff&rev=402455&r1=402454&r2=402455
==============================================================================
--- team/dlee/ASTERISK-22685-json-body/res/res_ari_channels.c (original)
+++ team/dlee/ASTERISK-22685-json-body/res/res_ari_channels.c Mon Nov 4 15:14:48 2013
@@ -70,7 +70,6 @@
int code;
#endif /* AST_DEVMODE */
-
ast_ari_get_channels(headers, &args, response);
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -151,7 +150,6 @@
} else
{}
}
-
/* Look for a JSON request entity */
body = ast_http_get_json(ser, headers);
if (!body) {
@@ -259,7 +257,6 @@
} else
{}
}
-
ast_ari_get_channel(headers, &args, response);
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -326,7 +323,6 @@
} else
{}
}
-
/* Look for a JSON request entity */
body = ast_http_get_json(ser, headers);
if (!body) {
@@ -420,7 +416,6 @@
} else
{}
}
-
/* Look for a JSON request entity */
body = ast_http_get_json(ser, headers);
if (!body) {
@@ -509,7 +504,6 @@
} else
{}
}
-
ast_ari_answer_channel(headers, &args, response);
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -570,7 +564,6 @@
} else
{}
}
-
ast_ari_ring_channel(headers, &args, response);
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -650,7 +643,6 @@
} else
{}
}
-
/* Look for a JSON request entity */
body = ast_http_get_json(ser, headers);
if (!body) {
@@ -755,7 +747,6 @@
} else
{}
}
-
/* Look for a JSON request entity */
body = ast_http_get_json(ser, headers);
if (!body) {
@@ -843,7 +834,6 @@
} else
{}
}
-
/* Look for a JSON request entity */
body = ast_http_get_json(ser, headers);
if (!body) {
@@ -924,7 +914,6 @@
} else
{}
}
-
ast_ari_hold_channel(headers, &args, response);
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -985,7 +974,6 @@
} else
{}
}
-
ast_ari_unhold_channel(headers, &args, response);
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -1053,7 +1041,6 @@
} else
{}
}
-
/* Look for a JSON request entity */
body = ast_http_get_json(ser, headers);
if (!body) {
@@ -1134,7 +1121,6 @@
} else
{}
}
-
ast_ari_moh_stop_channel(headers, &args, response);
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -1211,7 +1197,6 @@
} else
{}
}
-
/* Look for a JSON request entity */
body = ast_http_get_json(ser, headers);
if (!body) {
@@ -1329,7 +1314,6 @@
} else
{}
}
-
/* Look for a JSON request entity */
body = ast_http_get_json(ser, headers);
if (!body) {
@@ -1443,7 +1427,6 @@
} else
{}
}
-
/* Look for a JSON request entity */
body = ast_http_get_json(ser, headers);
if (!body) {
@@ -1535,7 +1518,6 @@
} else
{}
}
-
/* Look for a JSON request entity */
body = ast_http_get_json(ser, headers);
if (!body) {
Modified: team/dlee/ASTERISK-22685-json-body/res/res_ari_endpoints.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ASTERISK-22685-json-body/res/res_ari_endpoints.c?view=diff&rev=402455&r1=402454&r2=402455
==============================================================================
--- team/dlee/ASTERISK-22685-json-body/res/res_ari_endpoints.c (original)
+++ team/dlee/ASTERISK-22685-json-body/res/res_ari_endpoints.c Mon Nov 4 15:14:48 2013
@@ -69,7 +69,6 @@
int is_valid;
int code;
#endif /* AST_DEVMODE */
-
ast_ari_get_endpoints(headers, &args, response);
#if defined(AST_DEVMODE)
@@ -129,7 +128,6 @@
} else
{}
}
-
ast_ari_get_endpoints_by_tech(headers, &args, response);
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -191,7 +189,6 @@
} else
{}
}
-
ast_ari_get_endpoint(headers, &args, response);
#if defined(AST_DEVMODE)
code = response->response_code;
Modified: team/dlee/ASTERISK-22685-json-body/res/res_ari_events.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ASTERISK-22685-json-body/res/res_ari_events.c?view=diff&rev=402455&r1=402454&r2=402455
==============================================================================
--- team/dlee/ASTERISK-22685-json-body/res/res_ari_events.c (original)
+++ team/dlee/ASTERISK-22685-json-body/res/res_ari_events.c Mon Nov 4 15:14:48 2013
@@ -125,7 +125,6 @@
{}
}
-
ast_ari_websocket_event_websocket(session, headers, &args);
fin: __attribute__((unused))
Modified: team/dlee/ASTERISK-22685-json-body/res/res_ari_playback.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ASTERISK-22685-json-body/res/res_ari_playback.c?view=diff&rev=402455&r1=402454&r2=402455
==============================================================================
--- team/dlee/ASTERISK-22685-json-body/res/res_ari_playback.c (original)
+++ team/dlee/ASTERISK-22685-json-body/res/res_ari_playback.c Mon Nov 4 15:14:48 2013
@@ -77,7 +77,6 @@
} else
{}
}
-
ast_ari_get_playback(headers, &args, response);
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -137,7 +136,6 @@
} else
{}
}
-
ast_ari_stop_playback(headers, &args, response);
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -204,7 +202,6 @@
} else
{}
}
-
/* Look for a JSON request entity */
body = ast_http_get_json(ser, headers);
if (!body) {
Modified: team/dlee/ASTERISK-22685-json-body/res/res_ari_recordings.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ASTERISK-22685-json-body/res/res_ari_recordings.c?view=diff&rev=402455&r1=402454&r2=402455
==============================================================================
--- team/dlee/ASTERISK-22685-json-body/res/res_ari_recordings.c (original)
+++ team/dlee/ASTERISK-22685-json-body/res/res_ari_recordings.c Mon Nov 4 15:14:48 2013
@@ -70,7 +70,6 @@
int code;
#endif /* AST_DEVMODE */
-
ast_ari_get_stored_recordings(headers, &args, response);
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -129,7 +128,6 @@
} else
{}
}
-
ast_ari_get_stored_recording(headers, &args, response);
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -189,7 +187,6 @@
} else
{}
}
-
ast_ari_delete_stored_recording(headers, &args, response);
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -249,7 +246,6 @@
} else
{}
}
-
ast_ari_get_live_recording(headers, &args, response);
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -309,7 +305,6 @@
} else
{}
}
-
ast_ari_cancel_recording(headers, &args, response);
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -369,7 +364,6 @@
} else
{}
}
-
ast_ari_stop_recording(headers, &args, response);
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -429,7 +423,6 @@
} else
{}
}
-
ast_ari_pause_recording(headers, &args, response);
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -490,7 +483,6 @@
} else
{}
}
-
ast_ari_unpause_recording(headers, &args, response);
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -551,7 +543,6 @@
} else
{}
}
-
ast_ari_mute_recording(headers, &args, response);
#if defined(AST_DEVMODE)
code = response->response_code;
@@ -612,7 +603,6 @@
} else
{}
}
-
ast_ari_unmute_recording(headers, &args, response);
#if defined(AST_DEVMODE)
code = response->response_code;
Modified: team/dlee/ASTERISK-22685-json-body/res/res_ari_sounds.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ASTERISK-22685-json-body/res/res_ari_sounds.c?view=diff&rev=402455&r1=402454&r2=402455
==============================================================================
--- team/dlee/ASTERISK-22685-json-body/res/res_ari_sounds.c (original)
+++ team/dlee/ASTERISK-22685-json-body/res/res_ari_sounds.c Mon Nov 4 15:14:48 2013
@@ -81,7 +81,6 @@
} else
{}
}
-
/* Look for a JSON request entity */
body = ast_http_get_json(ser, headers);
if (!body) {
@@ -164,7 +163,6 @@
} else
{}
}
-
ast_ari_get_stored_sound(headers, &args, response);
#if defined(AST_DEVMODE)
code = response->response_code;
Modified: team/dlee/ASTERISK-22685-json-body/rest-api-templates/param_parsing.mustache
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ASTERISK-22685-json-body/rest-api-templates/param_parsing.mustache?view=diff&rev=402455&r1=402454&r2=402455
==============================================================================
--- team/dlee/ASTERISK-22685-json-body/rest-api-templates/param_parsing.mustache (original)
+++ team/dlee/ASTERISK-22685-json-body/rest-api-templates/param_parsing.mustache Mon Nov 4 15:14:48 2013
@@ -83,7 +83,6 @@
{}
}
{{/has_path_parameters}}
-
{{^is_websocket}}
{{#parse_body}}
/* Look for a JSON request entity */
More information about the svn-commits
mailing list