kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-04 12:12:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "aoc: Remove silly usage of RAII_VAR." into 13

Browse Source
This commit is contained in:
Joshua Colp
2017-11-21 11:16:08 -06:00
committed by Gerrit Code Review
parent 27491c6847 0e90d74604
commit d2fb0ffb5b
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
main/aoc.c
View File

@@ -1664,7 +1664,7 @@ static struct ast_json *currency_to_json(const char *name, int cost,
static struct ast_json *charge_to_json(const struct ast_aoc_decoded *decoded) static struct ast_json *charge_to_json(const struct ast_aoc_decoded *decoded)
{ {
RAII_VAR(struct ast_json *, obj, NULL, ast_json_unref); struct ast_json *obj;
const char *obj_type; const char *obj_type;
if (decoded->charge_type != AST_AOC_CHARGE_CURRENCY && if (decoded->charge_type != AST_AOC_CHARGE_CURRENCY &&
@@ -1686,7 +1686,7 @@ static struct ast_json *charge_to_json(const struct ast_aoc_decoded *decoded)
"Type", aoc_charge_type_str(decoded->charge_type), "Type", aoc_charge_type_str(decoded->charge_type),
"BillingID", aoc_billingid_str(decoded->billing_id), "BillingID", aoc_billingid_str(decoded->billing_id),
"TotalType", aoc_type_of_totaling_str(decoded->total_type), "TotalType", aoc_type_of_totaling_str(decoded->total_type),
obj_type, ast_json_ref(obj)); obj_type, obj);
} }
static struct ast_json *association_to_json(const struct ast_aoc_decoded *decoded) static struct ast_json *association_to_json(const struct ast_aoc_decoded *decoded)
@@ -1715,8 +1715,8 @@ static struct ast_json *s_to_json(const struct ast_aoc_decoded *decoded)
for (i = 0; i < decoded->aoc_s_count; ++i) { for (i = 0; i < decoded->aoc_s_count; ++i) {
struct ast_json *rate; struct ast_json *rate;
RAII_VAR(struct ast_json *, type, NULL, ast_json_unref); struct ast_json *type = NULL;
RAII_VAR(struct ast_json *, currency, NULL, ast_json_unref); struct ast_json *currency;
const char *charge_item = aoc_charged_item_str( const char *charge_item = aoc_charged_item_str(
decoded->aoc_s_entries[i].charged_item); decoded->aoc_s_entries[i].charged_item);
@@ -1731,8 +1731,8 @@ static struct ast_json *s_to_json(const struct ast_aoc_decoded *decoded)
switch (decoded->aoc_s_entries[i].rate_type) { switch (decoded->aoc_s_entries[i].rate_type) {
case AST_AOC_RATE_TYPE_DURATION: case AST_AOC_RATE_TYPE_DURATION:
{ {
RAII_VAR(struct ast_json *, time, NULL, ast_json_unref); struct ast_json *time;
RAII_VAR(struct ast_json *, granularity, NULL, ast_json_unref); struct ast_json *granularity = NULL;
currency = currency_to_json( currency = currency_to_json(
decoded->aoc_s_entries[i].rate.duration.currency_name, decoded->aoc_s_entries[i].rate.duration.currency_name,
@@ -1750,11 +1750,11 @@ static struct ast_json *s_to_json(const struct ast_aoc_decoded *decoded)
} }
type = ast_json_pack("{s:o, s:s, s:o, s:o}", type = ast_json_pack("{s:o, s:s, s:o, s:o}",
"Currency", ast_json_ref(currency), "Currency", currency,
"ChargingType", decoded->aoc_s_entries[i].rate.duration.charging_type "ChargingType", decoded->aoc_s_entries[i].rate.duration.charging_type
? "StepFunction" : "ContinuousCharging", ? "StepFunction" : "ContinuousCharging",
"Time", ast_json_ref(time), "Time", time,
"Granularity", granularity ? ast_json_ref(granularity) : ast_json_null()); "Granularity", granularity ?: ast_json_null());
break; break;
} }
@@ -1764,7 +1764,7 @@ static struct ast_json *s_to_json(const struct ast_aoc_decoded *decoded)
decoded->aoc_s_entries[i].rate.flat.amount, decoded->aoc_s_entries[i].rate.flat.amount,
decoded->aoc_s_entries[i].rate.flat.multiplier); decoded->aoc_s_entries[i].rate.flat.multiplier);
type = ast_json_pack("{s:o}", "Currency", ast_json_ref(currency)); type = ast_json_pack("{s:o}", "Currency", currency);
break; break;
case AST_AOC_RATE_TYPE_VOLUME: case AST_AOC_RATE_TYPE_VOLUME:
currency = currency_to_json( currency = currency_to_json(
@@ -1775,7 +1775,7 @@ static struct ast_json *s_to_json(const struct ast_aoc_decoded *decoded)
type = ast_json_pack("{s:s, s:o}", type = ast_json_pack("{s:s, s:o}",
"Unit", aoc_volume_unit_str( "Unit", aoc_volume_unit_str(
decoded->aoc_s_entries[i].rate.volume.volume_unit), decoded->aoc_s_entries[i].rate.volume.volume_unit),
"Currency", ast_json_ref(currency)); "Currency", currency);
break; break;
case AST_AOC_RATE_TYPE_SPECIAL_CODE: case AST_AOC_RATE_TYPE_SPECIAL_CODE:
type = ast_json_pack("{s:i}", type = ast_json_pack("{s:i}",
@@ -1787,7 +1787,7 @@ static struct ast_json *s_to_json(const struct ast_aoc_decoded *decoded)
rate = ast_json_pack("{s:s, s:o}", rate = ast_json_pack("{s:s, s:o}",
"Chargeable", charge_item, "Chargeable", charge_item,
aoc_rate_type_str(decoded->aoc_s_entries[i].rate_type), ast_json_ref(type)); aoc_rate_type_str(decoded->aoc_s_entries[i].rate_type), type);
if (ast_json_array_append(rates, rate)) { if (ast_json_array_append(rates, rate)) {
break; break;
} }