[sr-dev] git:4.2:5d5d1572: counters: fix return statement in void function

Daniel-Constantin Mierla miconda at gmail.com
Tue Jul 5 12:10:38 CEST 2016


Module: kamailio
Branch: 4.2
Commit: 5d5d1572c1896c9ec55337c7b318b3a4a981bec3
URL: https://github.com/kamailio/kamailio/commit/5d5d1572c1896c9ec55337c7b318b3a4a981bec3

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

counters: fix return statement in void function

(cherry picked from commit 37355281dffccc42b1d83f413e3d528bdcf6cdd0)
(cherry picked from commit 33073d2af70ed0f289de6cfa2d754763e037ce1b)
(cherry picked from commit 60585019c82f23f24fe51a2cb3d04db65aed012a)

---

Modified: modules/counters/counters.c

---

Diff:  https://github.com/kamailio/kamailio/commit/5d5d1572c1896c9ec55337c7b318b3a4a981bec3.diff
Patch: https://github.com/kamailio/kamailio/commit/5d5d1572c1896c9ec55337c7b318b3a4a981bec3.patch

---

diff --git a/modules/counters/counters.c b/modules/counters/counters.c
index 260f6cd..63dea2f 100644
--- a/modules/counters/counters.c
+++ b/modules/counters/counters.c
@@ -290,7 +290,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);
@@ -429,7 +430,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