[Asterisk-code-review] aoc: Remove silly usage of RAII VAR. (asterisk[master])

[Joshua Colp]

Joshua Colp has submitted this change and it was merged. ( https://gerrit.asterisk.org/7318 )

Change subject: aoc: Remove silly usage of RAII_VAR.
......................................................................

aoc: Remove silly usage of RAII_VAR.

Change-Id: I07907f833b81aeb0128bc9442a2abb52679c7511
---
M main/aoc.c
1 file changed, 12 insertions(+), 12 deletions(-)

Approvals:
  Richard Mudgett: Looks good to me, but someone else must approve
  Joshua Colp: Looks good to me, approved
  Jenkins2: Approved for Submit



diff --git a/main/aoc.c b/main/aoc.c
index 3487948..253c745 100644
--- a/main/aoc.c
+++ b/main/aoc.c
@@ -1663,7 +1663,7 @@
 
 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;
 
 	if (decoded->charge_type != AST_AOC_CHARGE_CURRENCY &&
@@ -1685,7 +1685,7 @@
 		"Type", aoc_charge_type_str(decoded->charge_type),
 		"BillingID", aoc_billingid_str(decoded->billing_id),
 		"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)
@@ -1714,8 +1714,8 @@
 
 	for (i = 0; i < decoded->aoc_s_count; ++i) {
 		struct ast_json *rate;
-		RAII_VAR(struct ast_json *, type, NULL, ast_json_unref);
-		RAII_VAR(struct ast_json *, currency, NULL, ast_json_unref);
+		struct ast_json *type = NULL;
+		struct ast_json *currency;
 		const char *charge_item = aoc_charged_item_str(
 			decoded->aoc_s_entries[i].charged_item);
 
@@ -1730,8 +1730,8 @@
 		switch (decoded->aoc_s_entries[i].rate_type) {
 		case AST_AOC_RATE_TYPE_DURATION:
 		{
-			RAII_VAR(struct ast_json *, time, NULL, ast_json_unref);
-			RAII_VAR(struct ast_json *, granularity, NULL, ast_json_unref);
+			struct ast_json *time;
+			struct ast_json *granularity = NULL;
 
 			currency = currency_to_json(
 				decoded->aoc_s_entries[i].rate.duration.currency_name,
@@ -1749,11 +1749,11 @@
 			}
 
 			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
 					? "StepFunction" : "ContinuousCharging",
-				"Time", ast_json_ref(time),
-				"Granularity", granularity ? ast_json_ref(granularity) : ast_json_null());
+				"Time", time,
+				"Granularity", granularity ?: ast_json_null());
 
 			break;
 		}
@@ -1763,7 +1763,7 @@
 				decoded->aoc_s_entries[i].rate.flat.amount,
 				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;
 		case AST_AOC_RATE_TYPE_VOLUME:
 			currency = currency_to_json(
@@ -1774,7 +1774,7 @@
 			type = ast_json_pack("{s:s, s:o}",
 				"Unit", aoc_volume_unit_str(
 					decoded->aoc_s_entries[i].rate.volume.volume_unit),
-				"Currency", ast_json_ref(currency));
+				"Currency", currency);
 			break;
 		case AST_AOC_RATE_TYPE_SPECIAL_CODE:
 			type = ast_json_pack("{s:i}",
@@ -1786,7 +1786,7 @@
 
 		rate = ast_json_pack("{s:s, s:o}",
 			"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)) {
 			break;
 		}

-- 
To view, visit https://gerrit.asterisk.org/7318
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I07907f833b81aeb0128bc9442a2abb52679c7511
Gerrit-Change-Number: 7318
Gerrit-PatchSet: 1
Gerrit-Owner: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Richard Mudgett <rmudgett at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20171121/c3cfee28/attachment.html>