[sr-dev] git:4.4:33073d2a: counters: fix return statement in void function

Daniel-Constantin Mierla miconda at gmail.com
Tue Jul 5 11:57:31 CEST 2016


Module: kamailio
Branch: 4.4
Commit: 33073d2af70ed0f289de6cfa2d754763e037ce1b
URL: https://github.com/kamailio/kamailio/commit/33073d2af70ed0f289de6cfa2d754763e037ce1b

Author: Spencer Thomason <spencer at whiteskycommunications.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2016-07-05T11:51:16+02:00

counters: fix return statement in void function

(cherry picked from commit 37355281dffccc42b1d83f413e3d528bdcf6cdd0)

---

Modified: modules/counters/counters.c

---

Diff:  https://github.com/kamailio/kamailio/commit/33073d2af70ed0f289de6cfa2d754763e037ce1b.diff
Patch: https://github.com/kamailio/kamailio/commit/33073d2af70ed0f289de6cfa2d754763e037ce1b.patch

---

diff --git a/modules/counters/counters.c b/modules/counters/counters.c
index 7d7f85e..d90ead1 100644
--- a/modules/counters/counters.c
+++ b/modules/counters/counters.c
@@ -288,7 +288,8 @@ static void cnt_get_rpc(rpc_t* rpc, void* c)
 	if (rpc->scan(c, "s", &group) < 1)
 		return;
 	if (rpc->scan(c, "*s", &name) < 1)
-		return cnt_grp_get_all(rpc, c, group);
+		cnt_grp_get_all(rpc, c, group);
+		return;
 	/* group & name read */
 	if (counter_lookup(&h, group, name) < 0) {
 		rpc->fault(c, 400, "non-existent counter %s.%s\n", group, name);
@@ -427,7 +428,7 @@ static void cnt_grp_get_all_rpc(rpc_t* rpc, void* c)
 		/* rpc->fault(c, 400, "group name required"); */
 		return;
 	}
-	return cnt_grp_get_all(rpc, c, group);
+	cnt_grp_get_all(rpc, c, group);
 }
 
 




More information about the sr-dev mailing list