From ab9ed74a65264ce7ef856ce9fe14c4739216271d Mon Sep 17 00:00:00 2001
From: "7u83@mail.ru" <7u83@mail.ru@noemail.net>
Date: Wed, 29 Apr 2015 10:11:37 +0000
Subject: [PATCH] *register* functions are returning the number of elements
 registered.

FossilOrigin-Name: 5b1f1ed4dbc6eae4d2735822802a15c3f0a410fcb8a65c8f1373b03f9c2b2fb0
---
 src/capwap/capwap_80211_actions_wtp.c | 15 ++++-----------
 src/capwap/capwap_actions_ac.c        | 10 +++++-----
 src/capwap/capwap_actions_wtp.c       | 13 ++++++-------
 src/capwap/cipwap_actions_ac.c        | 12 ++++++------
 src/capwap/cipwap_actions_wtp.c       | 22 +++++++---------------
 5 files changed, 28 insertions(+), 44 deletions(-)

diff --git a/src/capwap/capwap_80211_actions_wtp.c b/src/capwap/capwap_80211_actions_wtp.c
index 7d8220a9..49f5c585 100644
--- a/src/capwap/capwap_80211_actions_wtp.c
+++ b/src/capwap/capwap_80211_actions_wtp.c
@@ -52,17 +52,10 @@ cw_action_out_t capwap_80211_actions_wtp_out[]={
 
 int cw_register_actions_capwap_80211_wtp(struct cw_actiondef *def)
 {
-
-	cw_actionlist_in_register_actions(def->in, capwap_80211_actions_wtp_in);
-	cw_actionlist_out_register_actions(def->out, capwap_80211_actions_wtp_out);
-
 	int rc;
-	rc = cw_strheap_register_strings(def->strelem, capwap_strings_elem80211);
-	printf("80211 Registerd %d\n",rc);
-	/*rc += cw_strheap_register_strings(def->strelem, capwap_strings_elem);
-*/
-
-
-	return 1;
+	rc=cw_actionlist_in_register_actions(def->in, capwap_80211_actions_wtp_in);
+	rc+=cw_actionlist_out_register_actions(def->out, capwap_80211_actions_wtp_out);
+	rc+=cw_strheap_register_strings(def->strelem, capwap_strings_elem80211);
+	return rc;
 }
 
diff --git a/src/capwap/capwap_actions_ac.c b/src/capwap/capwap_actions_ac.c
index fdfc2771..6de26b7f 100644
--- a/src/capwap/capwap_actions_ac.c
+++ b/src/capwap/capwap_actions_ac.c
@@ -336,11 +336,11 @@ int cw_register_actions_capwap_ac(struct cw_actiondef *def)
 	def->strelem = cw_strheap_create();
 	def->wbids = intavltree_create();
 
-	cw_actionlist_in_register_actions(def->in, capwap_actions_ac_in);
-	cw_actionlist_out_register_actions(def->out, capwap_actions_ac_out);
-
 	int rc;
-	rc = cw_strheap_register_strings(def->strmsg, capwap_strings_msg);
+	rc = cw_actionlist_in_register_actions(def->in, capwap_actions_ac_in);
+	rc += cw_actionlist_out_register_actions(def->out, capwap_actions_ac_out);
+
+	rc += cw_strheap_register_strings(def->strmsg, capwap_strings_msg);
 	rc += cw_strheap_register_strings(def->strelem, capwap_strings_elem);
 	
 	
@@ -348,5 +348,5 @@ int cw_register_actions_capwap_ac(struct cw_actiondef *def)
 
 
 
-	return 1;
+	return rc;
 }
diff --git a/src/capwap/capwap_actions_wtp.c b/src/capwap/capwap_actions_wtp.c
index d0c5308f..c4e730d5 100644
--- a/src/capwap/capwap_actions_wtp.c
+++ b/src/capwap/capwap_actions_wtp.c
@@ -362,14 +362,13 @@ int cw_register_actions_capwap_wtp(struct cw_actiondef *def)
 	def->strmsg = cw_strheap_create();
 	def->strelem = cw_strheap_create();
 
-	cw_actionlist_in_register_actions(def->in, capwap_actions_wtp_in);
-	cw_actionlist_out_register_actions(def->out, capwap_actions_wtp_out);
-
 	int rc;
-	rc = cw_strheap_register_strings(def->strmsg, capwap_strings_msg);
+
+	rc = cw_actionlist_in_register_actions(def->in, capwap_actions_wtp_in);
+	rc += cw_actionlist_out_register_actions(def->out, capwap_actions_wtp_out);
+
+	rc += cw_strheap_register_strings(def->strmsg, capwap_strings_msg);
 	rc += cw_strheap_register_strings(def->strelem, capwap_strings_elem);
 
-
-
-	return 1;
+	return rc;
 }
diff --git a/src/capwap/cipwap_actions_ac.c b/src/capwap/cipwap_actions_ac.c
index c4e13759..84a15618 100644
--- a/src/capwap/cipwap_actions_ac.c
+++ b/src/capwap/cipwap_actions_ac.c
@@ -161,12 +161,12 @@ cw_action_out_t cipwap_actions_ac_out[] = {
  */ 
 int cw_register_actions_cipwap_ac(struct cw_actiondef *def)
 {
-	cw_register_actions_capwap_ac(def);
+	int rc;
+	rc=cw_register_actions_capwap_ac(def);
 
-	cw_actionlist_in_register_actions(def->in, cipwap_actions_ac_in);
-	cw_actionlist_out_register_actions(def->out, cipwap_actions_ac_out);
-	cw_strheap_register_strings(def->strelem,cipwap_strings_elem);
-
-	return 1;
+	rc+=cw_actionlist_in_register_actions(def->in, cipwap_actions_ac_in);
+	rc+=cw_actionlist_out_register_actions(def->out, cipwap_actions_ac_out);
+	rc+=cw_strheap_register_strings(def->strelem,cipwap_strings_elem);
+	return rc;
 }
 
diff --git a/src/capwap/cipwap_actions_wtp.c b/src/capwap/cipwap_actions_wtp.c
index 08de6b9d..847de574 100644
--- a/src/capwap/cipwap_actions_wtp.c
+++ b/src/capwap/cipwap_actions_wtp.c
@@ -149,23 +149,15 @@ cw_action_out_t cipwap_actions_wtp_out[] = {
 
 int cw_register_actions_cipwap_wtp(struct cw_actiondef *def)
 {
-/*
-	def->in = cw_actionlist_in_create();
-	def->out = cw_actionlist_out_create();
-	def->strmsg = cw_strheap_create();
-	def->strelem = cw_strheap_create();
-*/
-	cw_register_actions_capwap_wtp(def);
-
-
-	cw_actionlist_in_register_actions(def->in, cipwap_actions_wtp_in);
-	cw_actionlist_out_register_actions(def->out, cipwap_actions_wtp_out);
-
 	int rc;
+	rc=cw_register_actions_capwap_wtp(def);
+
+
+	rc+=cw_actionlist_in_register_actions(def->in, cipwap_actions_wtp_in);
+	rc+=cw_actionlist_out_register_actions(def->out, cipwap_actions_wtp_out);
+
 
 	rc += cw_strheap_register_strings(def->strelem, cipwap_strings_elem);
 
-
-
-	return 1;
+	return rc;
 }