summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoão Henrique Ferreira de Freitas <joaohf@gmail.com>2014-02-25 19:26:26 -0300
committerJoão Henrique Ferreira de Freitas <joaohf@gmail.com>2014-02-25 19:26:26 -0300
commit68f9a9c4ab01590d63506126660e3316ba668f99 (patch)
treebb0a3b8dfb5aceba94c567c3ca2e4697d42f569f
downloadmeta-openclovis-68f9a9c4ab01590d63506126660e3316ba668f99.tar.gz
Initial population
Diffstat
-rw-r--r--LICENSE20
-rw-r--r--README.md23
-rw-r--r--conf/layer.conf13
-rw-r--r--recipes-extended/openhpi-subagent/files/configure_pkgconfig_openhpiutils.patch38
-rw-r--r--recipes-extended/openhpi-subagent/files/fix_autoconf.patch38
-rw-r--r--recipes-extended/openhpi-subagent/files/glib.patch21
-rw-r--r--recipes-extended/openhpi-subagent/files/glib_mutex.patch50
-rw-r--r--recipes-extended/openhpi-subagent/files/netsnmp_unused.patch5218
-rw-r--r--recipes-extended/openhpi-subagent/files/openhpi-subagent-2.3.4-format.patch193
-rw-r--r--recipes-extended/openhpi-subagent/files/remove_unused_but_set_variable.patch20
-rw-r--r--recipes-extended/openhpi-subagent/openhpi-subagent.inc13
-rw-r--r--recipes-extended/openhpi-subagent/openhpi-subagent_2.3.4.bb15
-rw-r--r--recipes-extended/openhpi/files/configure_fix.patch18
-rw-r--r--recipes-extended/openhpi/files/my_changes.patch26
-rw-r--r--recipes-extended/openhpi/files/my_xml.patch15
-rw-r--r--recipes-extended/openhpi/files/openhpi_openclovis.patch237
-rw-r--r--recipes-extended/openhpi/files/xml.patch13
-rw-r--r--recipes-extended/openhpi/openhpi.inc15
-rw-r--r--recipes-extended/openhpi/openhpi_3.0.0.bb11
-rw-r--r--recipes-extended/openipmi/openipmi-2.0.21/makefile.patch20
-rw-r--r--recipes-extended/openipmi/openipmi-2.0.21/makefile_cmdlang.patch13
-rw-r--r--recipes-extended/openipmi/openipmi-2.0.21/makefile_glib.patch21
-rw-r--r--recipes-extended/openipmi/openipmi-2.0.21/makefile_tcl.patch13
-rw-r--r--recipes-extended/openipmi/openipmi.inc19
-rw-r--r--recipes-extended/openipmi/openipmi_2.0.21.bb12
-rw-r--r--recipes-extended/packagegroups/packagegroup-saf-base.bb44
-rw-r--r--recipes-extended/safplus/safplus_6.1.bb59
27 files changed, 6198 insertions, 0 deletions
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..7a45be4
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,20 @@
1The MIT License (MIT)
2
3Copyright (c) 2013 João Henrique Ferreira de Freitas
4
5Permission is hereby granted, free of charge, to any person obtaining a copy of
6this software and associated documentation files (the "Software"), to deal in
7the Software without restriction, including without limitation the rights to
8use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
9the Software, and to permit persons to whom the Software is furnished to do so,
10subject to the following conditions:
11
12The above copyright notice and this permission notice shall be included in all
13copies or substantial portions of the Software.
14
15THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
17FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
18COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
19IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
20CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..98195ef
--- /dev/null
+++ b/README.md
@@ -0,0 +1,23 @@
1meta-openclovis
2===============
3
4meta-openclovis
5
6This layer provides support for building SAFplus.
7
8Dependencies
9------------
10This layer depends on:
11
12URI: git://github.com/openembedded/oe-core.git
13branch: master
14revision: HEAD
15prio: default
16
17URI: git://github.com/openembedded/meta-oe.git
18branch: master
19revision: HEAD
20layers: meta-oe
21
22BBFILE_PRIORITY_openembedded-layer = "4"
23
diff --git a/conf/layer.conf b/conf/layer.conf
new file mode 100644
index 0000000..972dd6e
--- /dev/null
+++ b/conf/layer.conf
@@ -0,0 +1,13 @@
1# We have a conf and classes directory, add to BBPATH
2BBPATH .= ":${LAYERDIR}"
3
4# We have a recipes directory, add to BBFILES
5BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
6 ${LAYERDIR}/recipes-*/*/*.bbappend \
7 "
8
9BBFILE_COLLECTIONS += "openclovis"
10BBFILE_PATTERN_openclovis := "^${LAYERDIR}/"
11BBFILE_PRIORITY_openclovis = "9"
12
13LAYERDEPENDS_openclovis = "core openembedded-layer networking-layer"
diff --git a/recipes-extended/openhpi-subagent/files/configure_pkgconfig_openhpiutils.patch b/recipes-extended/openhpi-subagent/files/configure_pkgconfig_openhpiutils.patch
new file mode 100644
index 0000000..c1e073b
--- /dev/null
+++ b/recipes-extended/openhpi-subagent/files/configure_pkgconfig_openhpiutils.patch
@@ -0,0 +1,38 @@
1Index: openhpi-subagent-2.3.4/configure.ac
2===================================================================
3--- openhpi-subagent-2.3.4.orig/configure.ac
4+++ openhpi-subagent-2.3.4/configure.ac
5@@ -65,14 +65,14 @@ fi
6
7 # uncomment the section below when libopenhpiutils
8 # has its own pkgconfig file 'openhpiutils.pc'
9-# HPIUTILS_LIBS=`pkg-config --libs openhpiutils`
10-# if test "x$HPIUTILS_LIBS" = "x"; then
11-# AC_MSG_ERROR([
12-# *** OpenHpiUtils pkgconfig file wasn't found
13-# *** we can't determine proper build flags without it
14-# *** please check your installation
15-# ])
16-# fi
17+HPIUTILS_LIBS=`pkg-config --libs openhpiutils`
18+if test "x$HPIUTILS_LIBS" = "x"; then
19+ AC_MSG_ERROR([
20+ *** OpenHpiUtils pkgconfig file wasn't found
21+ *** we can't determine proper build flags without it
22+ *** please check your installation
23+ ])
24+ fi
25
26 LIBS=$HPI_LIBS
27 # Checks for libraries
28@@ -90,8 +90,8 @@ AC_CHECK_LIB([openhpiutils], [oh_lookup_
29 have_hpiutils=yes
30 # uncomment the 2 lines below when openhpiutils
31 # has its own pkgconfig file 'openhpiutils.pc'
32-# HPIUTILS_FLAGS=`pkg-config --cflags openhpiutils`
33-# HPIUTILS_LIBS=`pkg-config --libs openhpiutils`
34+ HPIUTILS_FLAGS=`pkg-config --cflags openhpiutils`
35+ HPIUTILS_LIBS=`pkg-config --libs openhpiutils`
36 ],
37 [OH_CHECK_FAIL(libopenhpiutils,openhpiutils-devel)])
38
diff --git a/recipes-extended/openhpi-subagent/files/fix_autoconf.patch b/recipes-extended/openhpi-subagent/files/fix_autoconf.patch
new file mode 100644
index 0000000..ad570c3
--- /dev/null
+++ b/recipes-extended/openhpi-subagent/files/fix_autoconf.patch
@@ -0,0 +1,38 @@
1diff -Naur openhpi-subagent-2.3.4-orig/acinclude.m4 openhpi-subagent-2.3.4/acinclude.m4
2--- openhpi-subagent-2.3.4-orig/acinclude.m4 2006-09-13 12:41:28.000000000 -0300
3+++ openhpi-subagent-2.3.4/acinclude.m4 2013-07-31 15:04:17.634435482 -0300
4@@ -54,9 +54,9 @@
5 ],
6 [
7 have_netsnmp=yes
8- SNMPFLAGS=`net-snmp-config --cflags | sed -e 's/-Wdeclaration-after-statement//g'`
9- SNMPALIBS=`net-snmp-config --agent-libs`
10- SNMPVERSIONOK=`net-snmp-config --version | awk -F\. '{ \
11+ SNMPFLAGS=`${net_snmp_config:-net-snmp-config} --cflags | sed -e 's/-Wdeclaration-after-statement//g'`
12+ SNMPALIBS=`${net_snmp_config:-net-snmp-config} --agent-libs`
13+ SNMPVERSIONOK=`${net_snmp_config:-net-snmp-config} --version | awk -F\. '{ \
14 if ( $[1] >= 5 ) { \
15 if ( $[2] > 0 ) print "OK"; \
16 if ( $[2] == 0) { \
17@@ -65,7 +65,7 @@
18 } \
19 }'`
20 # the following seems to work... thankfully.
21- SNMPCONFDIR=`net-snmp-config --configure-options | perl -p -e 's/.*sysconfdir=([\/\w]+).*/\1/'`
22+ SNMPCONFDIR=`${net_snmp_config:-net-snmp-config} --configure-options | perl -p -e 's/.*sysconfdir=([\/\w]+).*/\1/'`
23 if test "$SNMPVERSIONOK" == "OK"; then
24 AC_MSG_RESULT(yes)
25 else
26diff -Naur openhpi-subagent-2.3.4-orig/configure.ac openhpi-subagent-2.3.4/configure.ac
27--- openhpi-subagent-2.3.4-orig/configure.ac 2006-09-13 14:42:54.000000000 -0300
28+++ openhpi-subagent-2.3.4/configure.ac 2013-07-31 15:05:54.890438913 -0300
29@@ -95,6 +95,9 @@
30 ],
31 [OH_CHECK_FAIL(libopenhpiutils,openhpiutils-devel)])
32
33+AC_ARG_WITH(net-snmp-config,
34+ [[ --with-net-snmp-config=SCRIPT run SCRIPT as net-snmp-config]],
35+ [net_snmp_config=$withval])
36
37 OH_CHECK_NETSNMP
38
diff --git a/recipes-extended/openhpi-subagent/files/glib.patch b/recipes-extended/openhpi-subagent/files/glib.patch
new file mode 100644
index 0000000..0da4327
--- /dev/null
+++ b/recipes-extended/openhpi-subagent/files/glib.patch
@@ -0,0 +1,21 @@
1Index: openhpi-subagent-2.3.4/src/hpiEventThread.c
2===================================================================
3--- openhpi-subagent-2.3.4.orig/src/hpiEventThread.c
4+++ openhpi-subagent-2.3.4/src/hpiEventThread.c
5@@ -178,14 +178,13 @@ int start_event_thread(SaHpiSessionIdT *
6 DEBUGMSGTL ((AGENT, "Attempting to init event"));
7 if (!g_thread_supported()) {
8 DEBUGMSGTL ((AGENT, "Initializing thread support"));
9- g_thread_init(NULL);
10 } else {
11 DEBUGMSGTL ((AGENT, "Already supporting threads"));
12 }
13
14- event_thread = g_thread_create(event_thread_loop,
15+ event_thread = g_thread_try_new("event_thread",
16+ event_thread_loop,
17 (gpointer)sessionid,
18- FALSE,
19 &event_thread_error);
20
21
diff --git a/recipes-extended/openhpi-subagent/files/glib_mutex.patch b/recipes-extended/openhpi-subagent/files/glib_mutex.patch
new file mode 100644
index 0000000..e22e655
--- /dev/null
+++ b/recipes-extended/openhpi-subagent/files/glib_mutex.patch
@@ -0,0 +1,50 @@
1Index: openhpi-subagent-2.3.4/include/hpiLock.h
2===================================================================
3--- openhpi-subagent-2.3.4.orig/include/hpiLock.h
4+++ openhpi-subagent-2.3.4/include/hpiLock.h
5@@ -26,7 +26,7 @@ extern "C" {
6 #include <glib.h>
7
8 typedef struct {
9- GStaticRecMutex thread_mutex;
10+ GRecMutex thread_mutex;
11 int lockcount;
12 }hpi_lock_type;
13
14Index: openhpi-subagent-2.3.4/src/hpiLock.c
15===================================================================
16--- openhpi-subagent-2.3.4.orig/src/hpiLock.c
17+++ openhpi-subagent-2.3.4/src/hpiLock.c
18@@ -21,7 +21,7 @@
19 #include <net-snmp/library/snmp_debug.h>
20
21 hpi_lock_type hpi_lock_data = {
22- .thread_mutex = G_STATIC_REC_MUTEX_INIT,
23+ .thread_mutex = G_STATIC_MUTEX_INIT,
24 .lockcount = 0
25 };
26
27@@ -29,12 +29,12 @@ hpi_lock_type hpi_lock_data = {
28 void subagent_lock( hpi_lock_type * hpi_lock_data)
29 {
30
31- if (!g_static_rec_mutex_trylock(&hpi_lock_data->thread_mutex)) {
32+ if (!g_rec_mutex_trylock(&hpi_lock_data->thread_mutex)) {
33
34 DEBUGMSGTL ((AGENT, "********Going to block for a lock now. %p - lockcount %d\n",
35 g_thread_self(), hpi_lock_data->lockcount));
36
37- g_static_rec_mutex_lock(&hpi_lock_data->thread_mutex);
38+ g_rec_mutex_lock(&hpi_lock_data->thread_mutex);
39
40 hpi_lock_data->lockcount++;
41
42@@ -57,7 +57,7 @@ void subagent_unlock( hpi_lock_type * hp
43
44 hpi_lock_data->lockcount--;
45
46- g_static_rec_mutex_unlock(&hpi_lock_data->thread_mutex);
47+ g_rec_mutex_unlock(&hpi_lock_data->thread_mutex);
48
49 DEBUGMSGTL ((AGENT,"Released the lock, %p - lockcount %d\n",
50 g_thread_self(), hpi_lock_data->lockcount));
diff --git a/recipes-extended/openhpi-subagent/files/netsnmp_unused.patch b/recipes-extended/openhpi-subagent/files/netsnmp_unused.patch
new file mode 100644
index 0000000..ffed2ab
--- /dev/null
+++ b/recipes-extended/openhpi-subagent/files/netsnmp_unused.patch
@@ -0,0 +1,5218 @@
1Index: openhpi-subagent-2.3.4/src/saHpiAnnouncementEventLogTable.c
2===================================================================
3--- openhpi-subagent-2.3.4.orig/src/saHpiAnnouncementEventLogTable.c
4+++ openhpi-subagent-2.3.4/src/saHpiAnnouncementEventLogTable.c
5@@ -899,7 +899,6 @@ void saHpiAnnouncementEventLogTable_set_
6 // saHpiAnnouncementEventLogTable_context *row_ctx = (saHpiAnnouncementEventLogTable_context *)rg->existing_row;
7 // saHpiAnnouncementEventLogTable_context *undo_ctx = (saHpiAnnouncementEventLogTable_context *)rg->undo_info;
8 netsnmp_request_group_item *current;
9- netsnmp_variable_list *var;
10 int rc;
11
12 rg->rg_void = rg->list->ri;
13@@ -910,7 +909,6 @@ void saHpiAnnouncementEventLogTable_set_
14 */
15 for( current = rg->list; current; current = current->next ) {
16
17- var = current->ri->requestvb;
18 rc = SNMP_ERR_NOERROR;
19
20 switch(current->tri->colnum) {
21@@ -1220,7 +1218,6 @@ void saHpiAnnouncementEventLogTable_set_
22 */
23 void saHpiAnnouncementEventLogTable_set_commit( netsnmp_request_group *rg )
24 {
25- netsnmp_variable_list *var;
26 // saHpiAnnouncementEventLogTable_context *row_ctx = (saHpiAnnouncementEventLogTable_context *)rg->existing_row;
27 // saHpiAnnouncementEventLogTable_context *undo_ctx = (saHpiAnnouncementEventLogTable_context *)rg->undo_info;
28 netsnmp_request_group_item *current;
29@@ -1230,7 +1227,6 @@ void saHpiAnnouncementEventLogTable_set_
30 */
31 for( current = rg->list; current; current = current->next ) {
32
33- var = current->ri->requestvb;
34
35 switch(current->tri->colnum) {
36
37@@ -1303,7 +1299,6 @@ void saHpiAnnouncementEventLogTable_set_
38 */
39 void saHpiAnnouncementEventLogTable_set_free( netsnmp_request_group *rg )
40 {
41- netsnmp_variable_list *var;
42 // saHpiAnnouncementEventLogTable_context *row_ctx = (saHpiAnnouncementEventLogTable_context *)rg->existing_row;
43 // saHpiAnnouncementEventLogTable_context *undo_ctx = (saHpiAnnouncementEventLogTable_context *)rg->undo_info;
44 netsnmp_request_group_item *current;
45@@ -1313,7 +1308,6 @@ void saHpiAnnouncementEventLogTable_set_
46 */
47 for( current = rg->list; current; current = current->next ) {
48
49- var = current->ri->requestvb;
50
51 switch(current->tri->colnum) {
52
53@@ -1397,7 +1391,6 @@ void saHpiAnnouncementEventLogTable_set_
54 */
55 void saHpiAnnouncementEventLogTable_set_undo( netsnmp_request_group *rg )
56 {
57- netsnmp_variable_list *var;
58 // saHpiAnnouncementEventLogTable_context *row_ctx = (saHpiAnnouncementEventLogTable_context *)rg->existing_row;
59 // saHpiAnnouncementEventLogTable_context *undo_ctx = (saHpiAnnouncementEventLogTable_context *)rg->undo_info;
60 netsnmp_request_group_item *current;
61@@ -1407,7 +1400,6 @@ void saHpiAnnouncementEventLogTable_set_
62 */
63 for( current = rg->list; current; current = current->next ) {
64
65- var = current->ri->requestvb;
66
67 switch(current->tri->colnum) {
68
69Index: openhpi-subagent-2.3.4/src/saHpiAnnouncementTable.c
70===================================================================
71--- openhpi-subagent-2.3.4.orig/src/saHpiAnnouncementTable.c
72+++ openhpi-subagent-2.3.4/src/saHpiAnnouncementTable.c
73@@ -769,7 +769,6 @@ int announcement_delete (saHpiAnnounceme
74
75 void update_announcements (SaHpiSessionIdT sessionid)
76 {
77- SaErrorT rv;
78
79 // FOR RPT
80 SaHpiEntryIdT rpt_entry_id;
81@@ -782,14 +781,14 @@ void update_announcements (SaHpiSessionI
82
83 DEBUGMSGTL ((AGENT, "update_announcements() Called\n"));
84
85- rv = clear_announcements();
86+ clear_announcements();
87
88 rpt_entry_id = SAHPI_FIRST_ENTRY;
89 do {
90- rv = saHpiRptEntryGet(sessionid, rpt_entry_id, &rpt_entry_id, &rpt_entry);
91+ saHpiRptEntryGet(sessionid, rpt_entry_id, &rpt_entry_id, &rpt_entry);
92 rdr_entry_id = SAHPI_FIRST_ENTRY;
93 do {
94- rv = saHpiRdrGet(sessionid,
95+ saHpiRdrGet(sessionid,
96 rpt_entry.ResourceId,
97 rdr_entry_id,
98 &rdr_entry_id,
99@@ -1986,7 +1985,6 @@ void saHpiAnnouncementTable_set_action(
100 */
101 void saHpiAnnouncementTable_set_commit( netsnmp_request_group *rg )
102 {
103- netsnmp_variable_list *var;
104 // saHpiAnnouncementTable_context *row_ctx = (saHpiAnnouncementTable_context *)rg->existing_row;
105 // saHpiAnnouncementTable_context *undo_ctx = (saHpiAnnouncementTable_context *)rg->undo_info;
106 netsnmp_request_group_item *current;
107@@ -1999,7 +1997,6 @@ void saHpiAnnouncementTable_set_commit(
108 */
109 for( current = rg->list; current; current = current->next ) {
110
111- var = current->ri->requestvb;
112
113 switch(current->tri->colnum) {
114
115@@ -2080,7 +2077,6 @@ void saHpiAnnouncementTable_set_commit(
116 */
117 void saHpiAnnouncementTable_set_free( netsnmp_request_group *rg )
118 {
119- netsnmp_variable_list *var;
120 // saHpiAnnouncementTable_context *row_ctx = (saHpiAnnouncementTable_context *)rg->existing_row;
121 // saHpiAnnouncementTable_context *undo_ctx = (saHpiAnnouncementTable_context *)rg->undo_info;
122 netsnmp_request_group_item *current;
123@@ -2092,7 +2088,6 @@ void saHpiAnnouncementTable_set_free( ne
124 */
125 for( current = rg->list; current; current = current->next ) {
126
127- var = current->ri->requestvb;
128
129 switch(current->tri->colnum) {
130
131@@ -2184,7 +2179,6 @@ void saHpiAnnouncementTable_set_free( ne
132 */
133 void saHpiAnnouncementTable_set_undo( netsnmp_request_group *rg )
134 {
135- netsnmp_variable_list *var;
136 // saHpiAnnouncementTable_context *row_ctx = (saHpiAnnouncementTable_context *)rg->existing_row;
137 // saHpiAnnouncementTable_context *undo_ctx = (saHpiAnnouncementTable_context *)rg->undo_info;
138 netsnmp_request_group_item *current;
139@@ -2196,7 +2190,6 @@ void saHpiAnnouncementTable_set_undo( ne
140 */
141 for( current = rg->list; current; current = current->next ) {
142
143- var = current->ri->requestvb;
144
145 switch(current->tri->colnum) {
146
147Index: openhpi-subagent-2.3.4/src/saHpiAnnunciatorTable.c
148===================================================================
149--- openhpi-subagent-2.3.4.orig/src/saHpiAnnunciatorTable.c
150+++ openhpi-subagent-2.3.4/src/saHpiAnnunciatorTable.c
151@@ -991,7 +991,6 @@ void saHpiAnnunciatorTable_set_action( n
152 */
153 void saHpiAnnunciatorTable_set_commit( netsnmp_request_group *rg )
154 {
155- netsnmp_variable_list *var;
156 // saHpiAnnunciatorTable_context *row_ctx = (saHpiAnnunciatorTable_context *)rg->existing_row;
157 // saHpiAnnunciatorTable_context *undo_ctx = (saHpiAnnunciatorTable_context *)rg->undo_info;
158 netsnmp_request_group_item *current;
159@@ -1002,7 +1001,6 @@ void saHpiAnnunciatorTable_set_commit( n
160 */
161 for ( current = rg->list; current; current = current->next ) {
162
163- var = current->ri->requestvb;
164
165 switch (current->tri->colnum) {
166
167@@ -1031,7 +1029,6 @@ void saHpiAnnunciatorTable_set_commit( n
168 */
169 void saHpiAnnunciatorTable_set_free( netsnmp_request_group *rg )
170 {
171- netsnmp_variable_list *var;
172 // saHpiAnnunciatorTable_context *row_ctx = (saHpiAnnunciatorTable_context *)rg->existing_row;
173 // saHpiAnnunciatorTable_context *undo_ctx = (saHpiAnnunciatorTable_context *)rg->undo_info;
174 netsnmp_request_group_item *current;
175@@ -1042,7 +1039,6 @@ void saHpiAnnunciatorTable_set_free( net
176 */
177 for ( current = rg->list; current; current = current->next ) {
178
179- var = current->ri->requestvb;
180
181 switch (current->tri->colnum) {
182
183@@ -1083,7 +1079,6 @@ void saHpiAnnunciatorTable_set_free( net
184 */
185 void saHpiAnnunciatorTable_set_undo( netsnmp_request_group *rg )
186 {
187- netsnmp_variable_list *var;
188 // saHpiAnnunciatorTable_context *row_ctx = (saHpiAnnunciatorTable_context *)rg->existing_row;
189 // saHpiAnnunciatorTable_context *undo_ctx = (saHpiAnnunciatorTable_context *)rg->undo_info;
190 netsnmp_request_group_item *current;
191@@ -1094,7 +1089,6 @@ void saHpiAnnunciatorTable_set_undo( net
192 */
193 for ( current = rg->list; current; current = current->next ) {
194
195- var = current->ri->requestvb;
196
197 switch (current->tri->colnum) {
198
199Index: openhpi-subagent-2.3.4/src/saHpiAreaTable.c
200===================================================================
201--- openhpi-subagent-2.3.4.orig/src/saHpiAreaTable.c
202+++ openhpi-subagent-2.3.4/src/saHpiAreaTable.c
203@@ -1141,7 +1141,6 @@ void saHpiAreaTable_set_reserve2( netsnm
204 // saHpiAreaTable_context *row_ctx = (saHpiAreaTable_context *)rg->existing_row;
205 // saHpiAreaTable_context *undo_ctx = (saHpiAreaTable_context *)rg->undo_info;
206 netsnmp_request_group_item *current;
207- netsnmp_variable_list *var;
208 int rc;
209
210 DEBUGMSGTL ((AGENT, "saHpiAreaTable_set_reserve2, called\n"));
211@@ -1154,7 +1153,6 @@ void saHpiAreaTable_set_reserve2( netsnm
212 */
213 for ( current = rg->list; current; current = current->next ) {
214
215- var = current->ri->requestvb;
216 rc = SNMP_ERR_NOERROR;
217
218 switch (current->tri->colnum) {
219@@ -1290,7 +1288,6 @@ void saHpiAreaTable_set_action( netsnmp_
220 */
221 void saHpiAreaTable_set_commit( netsnmp_request_group *rg )
222 {
223- netsnmp_variable_list *var;
224 // saHpiAreaTable_context *row_ctx = (saHpiAreaTable_context *)rg->existing_row;
225 // saHpiAreaTable_context *undo_ctx = (saHpiAreaTable_context *)rg->undo_info;
226 netsnmp_request_group_item *current;
227@@ -1302,7 +1299,6 @@ void saHpiAreaTable_set_commit( netsnmp_
228 */
229 for ( current = rg->list; current; current = current->next ) {
230
231- var = current->ri->requestvb;
232
233 switch (current->tri->colnum) {
234
235@@ -1335,7 +1331,6 @@ void saHpiAreaTable_set_commit( netsnmp_
236 */
237 void saHpiAreaTable_set_free( netsnmp_request_group *rg )
238 {
239- netsnmp_variable_list *var;
240 // saHpiAreaTable_context *row_ctx = (saHpiAreaTable_context *)rg->existing_row;
241 // saHpiAreaTable_context *undo_ctx = (saHpiAreaTable_context *)rg->undo_info;
242 netsnmp_request_group_item *current;
243@@ -1347,7 +1342,6 @@ void saHpiAreaTable_set_free( netsnmp_re
244 */
245 for ( current = rg->list; current; current = current->next ) {
246
247- var = current->ri->requestvb;
248
249 switch (current->tri->colnum) {
250
251@@ -1392,7 +1386,6 @@ void saHpiAreaTable_set_free( netsnmp_re
252 */
253 void saHpiAreaTable_set_undo( netsnmp_request_group *rg )
254 {
255- netsnmp_variable_list *var;
256 // saHpiAreaTable_context *row_ctx = (saHpiAreaTable_context *)rg->existing_row;
257 // saHpiAreaTable_context *undo_ctx = (saHpiAreaTable_context *)rg->undo_info;
258 netsnmp_request_group_item *current;
259@@ -1404,7 +1397,6 @@ void saHpiAreaTable_set_undo( netsnmp_re
260 */
261 for ( current = rg->list; current; current = current->next ) {
262
263- var = current->ri->requestvb;
264
265 switch (current->tri->colnum) {
266
267Index: openhpi-subagent-2.3.4/src/saHpiAutoInsertTimeoutTable.c
268===================================================================
269--- openhpi-subagent-2.3.4.orig/src/saHpiAutoInsertTimeoutTable.c
270+++ openhpi-subagent-2.3.4/src/saHpiAutoInsertTimeoutTable.c
271@@ -614,7 +614,6 @@ void saHpiAutoInsertTimeoutTable_set_res
272 // saHpiAutoInsertTimeoutTable_context *row_ctx = (saHpiAutoInsertTimeoutTable_context *)rg->existing_row;
273 // saHpiAutoInsertTimeoutTable_context *undo_ctx = (saHpiAutoInsertTimeoutTable_context *)rg->undo_info;
274 netsnmp_request_group_item *current;
275- netsnmp_variable_list *var;
276 int rc;
277
278 rg->rg_void = rg->list->ri;
279@@ -625,7 +624,6 @@ void saHpiAutoInsertTimeoutTable_set_res
280 */
281 for( current = rg->list; current; current = current->next ) {
282
283- var = current->ri->requestvb;
284 rc = SNMP_ERR_NOERROR;
285
286 switch(current->tri->colnum) {
287@@ -743,7 +741,6 @@ void saHpiAutoInsertTimeoutTable_set_act
288 */
289 void saHpiAutoInsertTimeoutTable_set_commit( netsnmp_request_group *rg )
290 {
291- netsnmp_variable_list *var;
292 // saHpiAutoInsertTimeoutTable_context *row_ctx = (saHpiAutoInsertTimeoutTable_context *)rg->existing_row;
293 // saHpiAutoInsertTimeoutTable_context *undo_ctx = (saHpiAutoInsertTimeoutTable_context *)rg->undo_info;
294 netsnmp_request_group_item *current;
295@@ -753,7 +750,6 @@ void saHpiAutoInsertTimeoutTable_set_com
296 */
297 for( current = rg->list; current; current = current->next ) {
298
299- var = current->ri->requestvb;
300
301 switch(current->tri->colnum) {
302
303@@ -782,7 +778,6 @@ void saHpiAutoInsertTimeoutTable_set_com
304 */
305 void saHpiAutoInsertTimeoutTable_set_free( netsnmp_request_group *rg )
306 {
307- netsnmp_variable_list *var;
308 // saHpiAutoInsertTimeoutTable_context *row_ctx = (saHpiAutoInsertTimeoutTable_context *)rg->existing_row;
309 // saHpiAutoInsertTimeoutTable_context *undo_ctx = (saHpiAutoInsertTimeoutTable_context *)rg->undo_info;
310 netsnmp_request_group_item *current;
311@@ -792,7 +787,6 @@ void saHpiAutoInsertTimeoutTable_set_fre
312 */
313 for( current = rg->list; current; current = current->next ) {
314
315- var = current->ri->requestvb;
316
317 switch(current->tri->colnum) {
318
319@@ -832,7 +826,6 @@ void saHpiAutoInsertTimeoutTable_set_fre
320 */
321 void saHpiAutoInsertTimeoutTable_set_undo( netsnmp_request_group *rg )
322 {
323- netsnmp_variable_list *var;
324 // saHpiAutoInsertTimeoutTable_context *row_ctx = (saHpiAutoInsertTimeoutTable_context *)rg->existing_row;
325 // saHpiAutoInsertTimeoutTable_context *undo_ctx = (saHpiAutoInsertTimeoutTable_context *)rg->undo_info;
326 netsnmp_request_group_item *current;
327@@ -842,7 +835,6 @@ void saHpiAutoInsertTimeoutTable_set_und
328 */
329 for( current = rg->list; current; current = current->next ) {
330
331- var = current->ri->requestvb;
332
333 switch(current->tri->colnum) {
334
335Index: openhpi-subagent-2.3.4/src/saHpiCtrlAnalogTable.c
336===================================================================
337--- openhpi-subagent-2.3.4.orig/src/saHpiCtrlAnalogTable.c
338+++ openhpi-subagent-2.3.4/src/saHpiCtrlAnalogTable.c
339@@ -1119,7 +1119,6 @@ void saHpiCtrlAnalogTable_set_action( ne
340 */
341 void saHpiCtrlAnalogTable_set_commit( netsnmp_request_group *rg )
342 {
343- netsnmp_variable_list *var;
344 // saHpiCtrlAnalogTable_context *row_ctx = (saHpiCtrlAnalogTable_context *)rg->existing_row;
345 // saHpiCtrlAnalogTable_context *undo_ctx = (saHpiCtrlAnalogTable_context *)rg->undo_info;
346 netsnmp_request_group_item *current;
347@@ -1131,7 +1130,6 @@ void saHpiCtrlAnalogTable_set_commit( ne
348 */
349 for ( current = rg->list; current; current = current->next ) {
350
351- var = current->ri->requestvb;
352
353 switch (current->tri->colnum) {
354
355@@ -1164,7 +1162,6 @@ void saHpiCtrlAnalogTable_set_commit( ne
356 */
357 void saHpiCtrlAnalogTable_set_free( netsnmp_request_group *rg )
358 {
359- netsnmp_variable_list *var;
360 // saHpiCtrlAnalogTable_context *row_ctx = (saHpiCtrlAnalogTable_context *)rg->existing_row;
361 // saHpiCtrlAnalogTable_context *undo_ctx = (saHpiCtrlAnalogTable_context *)rg->undo_info;
362 netsnmp_request_group_item *current;
363@@ -1176,7 +1173,6 @@ void saHpiCtrlAnalogTable_set_free( nets
364 */
365 for ( current = rg->list; current; current = current->next ) {
366
367- var = current->ri->requestvb;
368
369 switch (current->tri->colnum) {
370
371@@ -1219,7 +1215,6 @@ void saHpiCtrlAnalogTable_set_free( nets
372 */
373 void saHpiCtrlAnalogTable_set_undo( netsnmp_request_group *rg )
374 {
375- netsnmp_variable_list *var;
376 // saHpiCtrlAnalogTable_context *row_ctx = (saHpiCtrlAnalogTable_context *)rg->existing_row;
377 // saHpiCtrlAnalogTable_context *undo_ctx = (saHpiCtrlAnalogTable_context *)rg->undo_info;
378 netsnmp_request_group_item *current;
379@@ -1231,7 +1226,6 @@ void saHpiCtrlAnalogTable_set_undo( nets
380 */
381 for ( current = rg->list; current; current = current->next ) {
382
383- var = current->ri->requestvb;
384
385 switch (current->tri->colnum) {
386
387Index: openhpi-subagent-2.3.4/src/saHpiCtrlDigitalTable.c
388===================================================================
389--- openhpi-subagent-2.3.4.orig/src/saHpiCtrlDigitalTable.c
390+++ openhpi-subagent-2.3.4/src/saHpiCtrlDigitalTable.c
391@@ -1090,7 +1090,6 @@ void saHpiCtrlDigitalTable_set_action( n
392 */
393 void saHpiCtrlDigitalTable_set_commit( netsnmp_request_group *rg )
394 {
395- netsnmp_variable_list *var;
396 // saHpiCtrlDigitalTable_context *row_ctx = (saHpiCtrlDigitalTable_context *)rg->existing_row;
397 // saHpiCtrlDigitalTable_context *undo_ctx = (saHpiCtrlDigitalTable_context *)rg->undo_info;
398 netsnmp_request_group_item *current;
399@@ -1102,7 +1101,6 @@ void saHpiCtrlDigitalTable_set_commit( n
400 */
401 for ( current = rg->list; current; current = current->next ) {
402
403- var = current->ri->requestvb;
404
405 switch (current->tri->colnum) {
406
407@@ -1135,7 +1133,6 @@ void saHpiCtrlDigitalTable_set_commit( n
408 */
409 void saHpiCtrlDigitalTable_set_free( netsnmp_request_group *rg )
410 {
411- netsnmp_variable_list *var;
412 // saHpiCtrlDigitalTable_context *row_ctx = (saHpiCtrlDigitalTable_context *)rg->existing_row;
413 // saHpiCtrlDigitalTable_context *undo_ctx = (saHpiCtrlDigitalTable_context *)rg->undo_info;
414 netsnmp_request_group_item *current;
415@@ -1148,7 +1145,6 @@ void saHpiCtrlDigitalTable_set_free( net
416 */
417 for ( current = rg->list; current; current = current->next ) {
418
419- var = current->ri->requestvb;
420
421 switch (current->tri->colnum) {
422
423@@ -1193,7 +1189,6 @@ void saHpiCtrlDigitalTable_set_free( net
424 */
425 void saHpiCtrlDigitalTable_set_undo( netsnmp_request_group *rg )
426 {
427- netsnmp_variable_list *var;
428 // saHpiCtrlDigitalTable_context *row_ctx = (saHpiCtrlDigitalTable_context *)rg->existing_row;
429 // saHpiCtrlDigitalTable_context *undo_ctx = (saHpiCtrlDigitalTable_context *)rg->undo_info;
430 netsnmp_request_group_item *current;
431@@ -1205,7 +1200,6 @@ void saHpiCtrlDigitalTable_set_undo( net
432 */
433 for ( current = rg->list; current; current = current->next ) {
434
435- var = current->ri->requestvb;
436
437 switch (current->tri->colnum) {
438
439Index: openhpi-subagent-2.3.4/src/saHpiCtrlDiscreteTable.c
440===================================================================
441--- openhpi-subagent-2.3.4.orig/src/saHpiCtrlDiscreteTable.c
442+++ openhpi-subagent-2.3.4/src/saHpiCtrlDiscreteTable.c
443@@ -1095,7 +1095,6 @@ void saHpiCtrlDiscreteTable_set_action(
444 */
445 void saHpiCtrlDiscreteTable_set_commit( netsnmp_request_group *rg )
446 {
447- netsnmp_variable_list *var;
448 // saHpiCtrlDiscreteTable_context *row_ctx = (saHpiCtrlDiscreteTable_context *)rg->existing_row;
449 // saHpiCtrlDiscreteTable_context *undo_ctx = (saHpiCtrlDiscreteTable_context *)rg->undo_info;
450 netsnmp_request_group_item *current;
451@@ -1105,7 +1104,6 @@ void saHpiCtrlDiscreteTable_set_commit(
452 */
453 for ( current = rg->list; current; current = current->next ) {
454
455- var = current->ri->requestvb;
456
457 switch (current->tri->colnum) {
458
459@@ -1138,7 +1136,6 @@ void saHpiCtrlDiscreteTable_set_commit(
460 */
461 void saHpiCtrlDiscreteTable_set_free( netsnmp_request_group *rg )
462 {
463- netsnmp_variable_list *var;
464 // saHpiCtrlDiscreteTable_context *row_ctx = (saHpiCtrlDiscreteTable_context *)rg->existing_row;
465 // saHpiCtrlDiscreteTable_context *undo_ctx = (saHpiCtrlDiscreteTable_context *)rg->undo_info;
466 netsnmp_request_group_item *current;
467@@ -1148,7 +1145,6 @@ void saHpiCtrlDiscreteTable_set_free( ne
468 */
469 for ( current = rg->list; current; current = current->next ) {
470
471- var = current->ri->requestvb;
472
473 switch (current->tri->colnum) {
474
475@@ -1193,7 +1189,6 @@ void saHpiCtrlDiscreteTable_set_free( ne
476 */
477 void saHpiCtrlDiscreteTable_set_undo( netsnmp_request_group *rg )
478 {
479- netsnmp_variable_list *var;
480 // saHpiCtrlDiscreteTable_context *row_ctx = (saHpiCtrlDiscreteTable_context *)rg->existing_row;
481 // saHpiCtrlDiscreteTable_context *undo_ctx = (saHpiCtrlDiscreteTable_context *)rg->undo_info;
482 netsnmp_request_group_item *current;
483@@ -1203,7 +1198,6 @@ void saHpiCtrlDiscreteTable_set_undo( ne
484 */
485 for ( current = rg->list; current; current = current->next ) {
486
487- var = current->ri->requestvb;
488
489 switch (current->tri->colnum) {
490
491Index: openhpi-subagent-2.3.4/src/saHpiCtrlOemTable.c
492===================================================================
493--- openhpi-subagent-2.3.4.orig/src/saHpiCtrlOemTable.c
494+++ openhpi-subagent-2.3.4/src/saHpiCtrlOemTable.c
495@@ -1098,7 +1098,6 @@ void saHpiCtrlOemTable_set_action( netsn
496 */
497 void saHpiCtrlOemTable_set_commit( netsnmp_request_group *rg )
498 {
499- netsnmp_variable_list *var;
500 // saHpiCtrlOemTable_context *row_ctx = (saHpiCtrlOemTable_context *)rg->existing_row;
501 // saHpiCtrlOemTable_context *undo_ctx = (saHpiCtrlOemTable_context *)rg->undo_info;
502 netsnmp_request_group_item *current;
503@@ -1108,7 +1107,6 @@ void saHpiCtrlOemTable_set_commit( netsn
504 */
505 for( current = rg->list; current; current = current->next ) {
506
507- var = current->ri->requestvb;
508
509 switch(current->tri->colnum) {
510
511@@ -1141,7 +1139,6 @@ void saHpiCtrlOemTable_set_commit( netsn
512 */
513 void saHpiCtrlOemTable_set_free( netsnmp_request_group *rg )
514 {
515- netsnmp_variable_list *var;
516 // saHpiCtrlOemTable_context *row_ctx = (saHpiCtrlOemTable_context *)rg->existing_row;
517 // saHpiCtrlOemTable_context *undo_ctx = (saHpiCtrlOemTable_context *)rg->undo_info;
518 netsnmp_request_group_item *current;
519@@ -1151,7 +1148,6 @@ void saHpiCtrlOemTable_set_free( netsnmp
520 */
521 for( current = rg->list; current; current = current->next ) {
522
523- var = current->ri->requestvb;
524
525 switch(current->tri->colnum) {
526
527@@ -1194,7 +1190,6 @@ void saHpiCtrlOemTable_set_free( netsnmp
528 */
529 void saHpiCtrlOemTable_set_undo( netsnmp_request_group *rg )
530 {
531- netsnmp_variable_list *var;
532 // saHpiCtrlOemTable_context *row_ctx = (saHpiCtrlOemTable_context *)rg->existing_row;
533 // saHpiCtrlOemTable_context *undo_ctx = (saHpiCtrlOemTable_context *)rg->undo_info;
534 netsnmp_request_group_item *current;
535@@ -1204,7 +1199,6 @@ void saHpiCtrlOemTable_set_undo( netsnmp
536 */
537 for( current = rg->list; current; current = current->next ) {
538
539- var = current->ri->requestvb;
540
541 switch(current->tri->colnum) {
542
543Index: openhpi-subagent-2.3.4/src/saHpiCtrlStreamTable.c
544===================================================================
545--- openhpi-subagent-2.3.4.orig/src/saHpiCtrlStreamTable.c
546+++ openhpi-subagent-2.3.4/src/saHpiCtrlStreamTable.c
547@@ -1134,7 +1134,6 @@ void saHpiCtrlStreamTable_set_action( ne
548 */
549 void saHpiCtrlStreamTable_set_commit( netsnmp_request_group *rg )
550 {
551- netsnmp_variable_list *var;
552 // saHpiCtrlStreamTable_context *row_ctx = (saHpiCtrlStreamTable_context *)rg->existing_row;
553 // saHpiCtrlStreamTable_context *undo_ctx = (saHpiCtrlStreamTable_context *)rg->undo_info;
554 netsnmp_request_group_item *current;
555@@ -1146,7 +1145,6 @@ void saHpiCtrlStreamTable_set_commit( ne
556 */
557 for ( current = rg->list; current; current = current->next ) {
558
559- var = current->ri->requestvb;
560
561 switch (current->tri->colnum) {
562
563@@ -1183,7 +1181,6 @@ void saHpiCtrlStreamTable_set_commit( ne
564 */
565 void saHpiCtrlStreamTable_set_free( netsnmp_request_group *rg )
566 {
567- netsnmp_variable_list *var;
568 // saHpiCtrlStreamTable_context *row_ctx = (saHpiCtrlStreamTable_context *)rg->existing_row;
569 // saHpiCtrlStreamTable_context *undo_ctx = (saHpiCtrlStreamTable_context *)rg->undo_info;
570 netsnmp_request_group_item *current;
571@@ -1195,7 +1192,6 @@ void saHpiCtrlStreamTable_set_free( nets
572 */
573 for ( current = rg->list; current; current = current->next ) {
574
575- var = current->ri->requestvb;
576
577 switch (current->tri->colnum) {
578
579@@ -1242,7 +1238,6 @@ void saHpiCtrlStreamTable_set_free( nets
580 */
581 void saHpiCtrlStreamTable_set_undo( netsnmp_request_group *rg )
582 {
583- netsnmp_variable_list *var;
584 // saHpiCtrlStreamTable_context *row_ctx = (saHpiCtrlStreamTable_context *)rg->existing_row;
585 // saHpiCtrlStreamTable_context *undo_ctx = (saHpiCtrlStreamTable_context *)rg->undo_info;
586 netsnmp_request_group_item *current;
587@@ -1254,7 +1249,6 @@ void saHpiCtrlStreamTable_set_undo( nets
588 */
589 for ( current = rg->list; current; current = current->next ) {
590
591- var = current->ri->requestvb;
592
593 switch (current->tri->colnum) {
594
595Index: openhpi-subagent-2.3.4/src/saHpiCtrlTextTable.c
596===================================================================
597--- openhpi-subagent-2.3.4.orig/src/saHpiCtrlTextTable.c
598+++ openhpi-subagent-2.3.4/src/saHpiCtrlTextTable.c
599@@ -1133,7 +1133,6 @@ void saHpiCtrlTextTable_set_action( nets
600 */
601 void saHpiCtrlTextTable_set_commit( netsnmp_request_group *rg )
602 {
603- netsnmp_variable_list *var;
604 // saHpiCtrlTextTable_context *row_ctx = (saHpiCtrlTextTable_context *)rg->existing_row;
605 // saHpiCtrlTextTable_context *undo_ctx = (saHpiCtrlTextTable_context *)rg->undo_info;
606 netsnmp_request_group_item *current;
607@@ -1143,7 +1142,6 @@ void saHpiCtrlTextTable_set_commit( nets
608 */
609 for ( current = rg->list; current; current = current->next ) {
610
611- var = current->ri->requestvb;
612
613 switch (current->tri->colnum) {
614
615@@ -1180,7 +1178,6 @@ void saHpiCtrlTextTable_set_commit( nets
616 */
617 void saHpiCtrlTextTable_set_free( netsnmp_request_group *rg )
618 {
619- netsnmp_variable_list *var;
620 // saHpiCtrlTextTable_context *row_ctx = (saHpiCtrlTextTable_context *)rg->existing_row;
621 // saHpiCtrlTextTable_context *undo_ctx = (saHpiCtrlTextTable_context *)rg->undo_info;
622 netsnmp_request_group_item *current;
623@@ -1190,7 +1187,6 @@ void saHpiCtrlTextTable_set_free( netsnm
624 */
625 for ( current = rg->list; current; current = current->next ) {
626
627- var = current->ri->requestvb;
628
629 switch (current->tri->colnum) {
630
631@@ -1237,7 +1233,6 @@ void saHpiCtrlTextTable_set_free( netsnm
632 */
633 void saHpiCtrlTextTable_set_undo( netsnmp_request_group *rg )
634 {
635- netsnmp_variable_list *var;
636 // saHpiCtrlTextTable_context *row_ctx = (saHpiCtrlTextTable_context *)rg->existing_row;
637 // saHpiCtrlTextTable_context *undo_ctx = (saHpiCtrlTextTable_context *)rg->undo_info;
638 netsnmp_request_group_item *current;
639@@ -1247,7 +1242,6 @@ void saHpiCtrlTextTable_set_undo( netsnm
640 */
641 for ( current = rg->list; current; current = current->next ) {
642
643- var = current->ri->requestvb;
644
645 switch (current->tri->colnum) {
646
647Index: openhpi-subagent-2.3.4/src/saHpiCurrentSensorStateTable.c
648===================================================================
649--- openhpi-subagent-2.3.4.orig/src/saHpiCurrentSensorStateTable.c
650+++ openhpi-subagent-2.3.4/src/saHpiCurrentSensorStateTable.c
651@@ -1509,7 +1509,6 @@ void saHpiCurrentSensorStateTable_set_ac
652 */
653 void saHpiCurrentSensorStateTable_set_commit( netsnmp_request_group *rg )
654 {
655- netsnmp_variable_list *var;
656 // saHpiCurrentSensorStateTable_context *row_ctx =
657 // (saHpiCurrentSensorStateTable_context *)rg->existing_row;
658 // saHpiCurrentSensorStateTable_context *undo_ctx =
659@@ -1523,7 +1522,6 @@ void saHpiCurrentSensorStateTable_set_co
660 */
661 for ( current = rg->list; current; current = current->next ) {
662
663- var = current->ri->requestvb;
664
665 switch (current->tri->colnum) {
666
667@@ -1572,7 +1570,6 @@ void saHpiCurrentSensorStateTable_set_co
668 */
669 void saHpiCurrentSensorStateTable_set_free( netsnmp_request_group *rg )
670 {
671- netsnmp_variable_list *var;
672 // saHpiCurrentSensorStateTable_context *row_ctx =
673 // (saHpiCurrentSensorStateTable_context *)rg->existing_row;
674 // saHpiCurrentSensorStateTable_context *undo_ctx =
675@@ -1586,7 +1583,6 @@ void saHpiCurrentSensorStateTable_set_fr
676 */
677 for ( current = rg->list; current; current = current->next ) {
678
679- var = current->ri->requestvb;
680
681 switch (current->tri->colnum) {
682
683@@ -1645,7 +1641,6 @@ void saHpiCurrentSensorStateTable_set_fr
684 */
685 void saHpiCurrentSensorStateTable_set_undo( netsnmp_request_group *rg )
686 {
687- netsnmp_variable_list *var;
688 // saHpiCurrentSensorStateTable_context *row_ctx =
689 // (saHpiCurrentSensorStateTable_context *)rg->existing_row;
690 // saHpiCurrentSensorStateTable_context *undo_ctx =
691@@ -1659,7 +1654,6 @@ void saHpiCurrentSensorStateTable_set_un
692 */
693 for ( current = rg->list; current; current = current->next ) {
694
695- var = current->ri->requestvb;
696
697 switch (current->tri->colnum) {
698
699Index: openhpi-subagent-2.3.4/src/saHpiDomainAlarmTable.c
700===================================================================
701--- openhpi-subagent-2.3.4.orig/src/saHpiDomainAlarmTable.c
702+++ openhpi-subagent-2.3.4/src/saHpiDomainAlarmTable.c
703@@ -1639,7 +1639,6 @@ void saHpiDomainAlarmTable_set_action( n
704 */
705 void saHpiDomainAlarmTable_set_commit( netsnmp_request_group *rg )
706 {
707- netsnmp_variable_list *var;
708 // saHpiDomainAlarmTable_context *row_ctx = (saHpiDomainAlarmTable_context *)rg->existing_row;
709 // saHpiDomainAlarmTable_context *undo_ctx = (saHpiDomainAlarmTable_context *)rg->undo_info;
710 netsnmp_request_group_item *current;
711@@ -1649,7 +1648,6 @@ void saHpiDomainAlarmTable_set_commit( n
712 */
713 for( current = rg->list; current; current = current->next ) {
714
715- var = current->ri->requestvb;
716
717 switch(current->tri->colnum) {
718
719@@ -1730,7 +1728,6 @@ void saHpiDomainAlarmTable_set_commit( n
720 */
721 void saHpiDomainAlarmTable_set_free( netsnmp_request_group *rg )
722 {
723- netsnmp_variable_list *var;
724 // saHpiDomainAlarmTable_context *row_ctx = (saHpiDomainAlarmTable_context *)rg->existing_row;
725 // saHpiDomainAlarmTable_context *undo_ctx = (saHpiDomainAlarmTable_context *)rg->undo_info;
726 netsnmp_request_group_item *current;
727@@ -1740,7 +1737,6 @@ void saHpiDomainAlarmTable_set_free( net
728 */
729 for( current = rg->list; current; current = current->next ) {
730
731- var = current->ri->requestvb;
732
733 switch(current->tri->colnum) {
734
735@@ -1832,7 +1828,6 @@ void saHpiDomainAlarmTable_set_free( net
736 */
737 void saHpiDomainAlarmTable_set_undo( netsnmp_request_group *rg )
738 {
739- netsnmp_variable_list *var;
740 // saHpiDomainAlarmTable_context *row_ctx = (saHpiDomainAlarmTable_context *)rg->existing_row;
741 // saHpiDomainAlarmTable_context *undo_ctx = (saHpiDomainAlarmTable_context *)rg->undo_info;
742 netsnmp_request_group_item *current;
743@@ -1842,7 +1837,6 @@ void saHpiDomainAlarmTable_set_undo( net
744 */
745 for( current = rg->list; current; current = current->next ) {
746
747- var = current->ri->requestvb;
748
749 switch(current->tri->colnum) {
750
751Index: openhpi-subagent-2.3.4/src/saHpiDomainEventLogTable.c
752===================================================================
753--- openhpi-subagent-2.3.4.orig/src/saHpiDomainEventLogTable.c
754+++ openhpi-subagent-2.3.4/src/saHpiDomainEventLogTable.c
755@@ -102,7 +102,6 @@ SaErrorT populate_saHpiDomainEventLogTab
756 oid * this_child_oid,
757 size_t *this_child_oid_len)
758 {
759- SaErrorT rv = SA_OK;
760
761 oid domain_evt_oid[DOMAIN_EVENT_LOG_INDEX_NR];
762 netsnmp_index domain_evt_idx;
763@@ -153,7 +152,7 @@ SaErrorT populate_saHpiDomainEventLogTab
764 /* create full oid on This row for parent RowPointer */
765 column[0] = 1;
766 column[1] = COLUMN_SAHPIDOMAINEVENTLOGTIMESTAMP;
767- memset(this_child_oid, 0, sizeof(this_child_oid));
768+ memset(this_child_oid, 0, MAX_OID_LEN);
769 build_full_oid(saHpiDomainEventLogTable_oid, saHpiDomainEventLogTable_oid_len,
770 column, column_len,
771 &domain_evt_idx,
772@@ -174,7 +173,7 @@ SaErrorT populate_saHpiDomainEventLogTab
773
774 if (!domain_evt_ctx) {
775 snmp_log (LOG_ERR, "Not enough memory for a Domain Event Log row!");
776- rv = AGENT_ERR_INTERNAL_ERROR;
777+ return AGENT_ERR_INTERNAL_ERROR;
778 }
779
780 /** SaHpiEntryId = ASN_UNSIGNED */
781@@ -217,7 +216,6 @@ SaErrorT domain_event_log_clear(SaHpiSes
782
783 oid domain_evt_oid[DOMAIN_EVENT_LOG_INDEX_NR];
784 netsnmp_index domain_evt_idx;
785- netsnmp_index *domain_index;
786 saHpiDomainEventLogTable_context *domain_evt_ctx;
787
788 DR_XREF *dr_entry;
789@@ -244,7 +242,7 @@ SaErrorT domain_event_log_clear(SaHpiSes
790 /* assign the indices to the index */
791 domain_evt_idx.oids = (oid *) & domain_evt_oid;
792
793- domain_index = CONTAINER_FIRST(cb.container);
794+ CONTAINER_FIRST(cb.container);
795 domain_evt_ctx = CONTAINER_FIND(cb.container, &domain_evt_idx);
796
797 if (!domain_evt_ctx) {
798@@ -826,7 +824,6 @@ void saHpiDomainEventLogTable_set_reserv
799 // (saHpiDomainEventLogTable_context *)rg->existing_row;
800 // saHpiDomainEventLogTable_context *undo_ctx =
801 // (saHpiDomainEventLogTable_context *)rg->undo_info;
802- netsnmp_variable_list *var;
803 netsnmp_request_group_item *current;
804 int rc;
805
806@@ -839,7 +836,6 @@ void saHpiDomainEventLogTable_set_reserv
807 */
808 for( current = rg->list; current; current = current->next ) {
809
810- var = current->ri->requestvb;
811 rc = SNMP_ERR_NOERROR;
812
813 switch(current->tri->colnum) {
814@@ -866,7 +862,6 @@ void saHpiDomainEventLogTable_set_reserv
815 // saHpiDomainEventLogTable_context *row_ctx = (saHpiDomainEventLogTable_context *)rg->existing_row;
816 // saHpiDomainEventLogTable_context *undo_ctx = (saHpiDomainEventLogTable_context *)rg->undo_info;
817 netsnmp_request_group_item *current;
818- netsnmp_variable_list *var;
819 int rc;
820
821 rg->rg_void = rg->list->ri;
822@@ -877,7 +872,6 @@ void saHpiDomainEventLogTable_set_reserv
823 */
824 for( current = rg->list; current; current = current->next ) {
825
826- var = current->ri->requestvb;
827 rc = SNMP_ERR_NOERROR;
828
829 switch(current->tri->colnum) {
830@@ -909,7 +903,6 @@ void saHpiDomainEventLogTable_set_reserv
831 */
832 void saHpiDomainEventLogTable_set_action( netsnmp_request_group *rg )
833 {
834- netsnmp_variable_list *var;
835 // saHpiDomainEventLogTable_context *row_ctx = (saHpiDomainEventLogTable_context *)rg->existing_row;
836 // saHpiDomainEventLogTable_context *undo_ctx = (saHpiDomainEventLogTable_context *)rg->undo_info;
837 netsnmp_request_group_item *current;
838@@ -924,7 +917,6 @@ void saHpiDomainEventLogTable_set_action
839 */
840 for( current = rg->list; current; current = current->next ) {
841
842- var = current->ri->requestvb;
843
844 switch(current->tri->colnum) {
845
846@@ -970,7 +962,6 @@ void saHpiDomainEventLogTable_set_action
847 */
848 void saHpiDomainEventLogTable_set_commit( netsnmp_request_group *rg )
849 {
850- netsnmp_variable_list *var;
851 // saHpiDomainEventLogTable_context *row_ctx = (saHpiDomainEventLogTable_context *)rg->existing_row;
852 // saHpiDomainEventLogTable_context *undo_ctx = (saHpiDomainEventLogTable_context *)rg->undo_info;
853 netsnmp_request_group_item *current;
854@@ -980,7 +971,6 @@ void saHpiDomainEventLogTable_set_commit
855 */
856 for( current = rg->list; current; current = current->next ) {
857
858- var = current->ri->requestvb;
859
860 switch(current->tri->colnum) {
861
862@@ -1005,7 +995,6 @@ void saHpiDomainEventLogTable_set_commit
863 */
864 void saHpiDomainEventLogTable_set_free( netsnmp_request_group *rg )
865 {
866- netsnmp_variable_list *var;
867 // saHpiDomainEventLogTable_context *row_ctx = (saHpiDomainEventLogTable_context *)rg->existing_row;
868 // saHpiDomainEventLogTable_context *undo_ctx = (saHpiDomainEventLogTable_context *)rg->undo_info;
869 netsnmp_request_group_item *current;
870@@ -1015,7 +1004,6 @@ void saHpiDomainEventLogTable_set_free(
871 */
872 for( current = rg->list; current; current = current->next ) {
873
874- var = current->ri->requestvb;
875
876 switch(current->tri->colnum) {
877
878@@ -1051,7 +1039,6 @@ void saHpiDomainEventLogTable_set_free(
879 */
880 void saHpiDomainEventLogTable_set_undo( netsnmp_request_group *rg )
881 {
882- netsnmp_variable_list *var;
883 // saHpiDomainEventLogTable_context *row_ctx = (saHpiDomainEventLogTable_context *)rg->existing_row;
884 // saHpiDomainEventLogTable_context *undo_ctx = (saHpiDomainEventLogTable_context *)rg->undo_info;
885 netsnmp_request_group_item *current;
886@@ -1061,7 +1048,6 @@ void saHpiDomainEventLogTable_set_undo(
887 */
888 for( current = rg->list; current; current = current->next ) {
889
890- var = current->ri->requestvb;
891
892 switch(current->tri->colnum) {
893
894Index: openhpi-subagent-2.3.4/src/saHpiDomainEventTable.c
895===================================================================
896--- openhpi-subagent-2.3.4.orig/src/saHpiDomainEventTable.c
897+++ openhpi-subagent-2.3.4/src/saHpiDomainEventTable.c
898@@ -103,7 +103,6 @@ SaErrorT populate_saHpiDomainEventTable(
899 oid * this_child_oid,
900 size_t *this_child_oid_len)
901 {
902- SaErrorT rv = SA_OK;
903 int new_row = MIB_FALSE;
904
905 oid domain_evt_oid[DOMAIN_EVENT_INDEX_NR];
906@@ -162,7 +161,7 @@ SaErrorT populate_saHpiDomainEventTable(
907 }
908 if (!domain_evt_ctx) {
909 snmp_log (LOG_ERR, "Not enough memory for a Domain Event row!");
910- rv = AGENT_ERR_INTERNAL_ERROR;
911+ return AGENT_ERR_INTERNAL_ERROR;
912 }
913
914 /** SaHpiEntryId = ASN_UNSIGNED */
915@@ -184,7 +183,7 @@ SaErrorT populate_saHpiDomainEventTable(
916 /* create full oid on This row for parent RowPointer */
917 column[0] = 1;
918 column[1] = COLUMN_SAHPIDOMAINEVENTTIMESTAMP;
919- memset(this_child_oid, 0, sizeof(this_child_oid));
920+ memset(this_child_oid, 0, sizeof(*this_child_oid));
921 build_full_oid(saHpiDomainEventTable_oid, saHpiDomainEventTable_oid_len,
922 column, column_len,
923 &domain_evt_idx,
924@@ -203,7 +202,6 @@ SaErrorT async_domain_event_add(SaHpiSes
925 oid * this_child_oid,
926 size_t *this_child_oid_len)
927 {
928- SaErrorT rv = SA_OK;
929 int new_row = MIB_FALSE;
930
931 oid domain_evt_oid[DOMAIN_EVENT_INDEX_NR];
932@@ -257,7 +255,7 @@ SaErrorT async_domain_event_add(SaHpiSes
933 }
934 if (!domain_evt_ctx) {
935 snmp_log (LOG_ERR, "Not enough memory for a Domain Event row!");
936- rv = AGENT_ERR_INTERNAL_ERROR;
937+ return AGENT_ERR_INTERNAL_ERROR;
938 }
939
940 /** SaHpiEntryId = ASN_UNSIGNED */
941@@ -279,7 +277,7 @@ SaErrorT async_domain_event_add(SaHpiSes
942 /* create full oid on This row for parent RowPointer */
943 column[0] = 1;
944 column[1] = COLUMN_SAHPIDOMAINEVENTTIMESTAMP;
945- memset(this_child_oid, 0, sizeof(this_child_oid));
946+ memset(this_child_oid, 0, sizeof(*this_child_oid));
947 build_full_oid(saHpiDomainEventTable_oid, saHpiDomainEventTable_oid_len,
948 column, column_len,
949 &domain_evt_idx,
950@@ -836,7 +834,6 @@ void saHpiDomainEventTable_set_reserve1(
951 // (saHpiDomainEventTable_context *)rg->existing_row;
952 // saHpiDomainEventTable_context *undo_ctx =
953 // (saHpiDomainEventTable_context *)rg->undo_info;
954- netsnmp_variable_list *var;
955 netsnmp_request_group_item *current;
956 int rc;
957
958@@ -849,7 +846,6 @@ void saHpiDomainEventTable_set_reserve1(
959 */
960 for( current = rg->list; current; current = current->next ) {
961
962- var = current->ri->requestvb;
963 rc = SNMP_ERR_NOERROR;
964
965 switch(current->tri->colnum) {
966@@ -876,7 +872,6 @@ void saHpiDomainEventTable_set_reserve2(
967 // saHpiDomainEventTable_context *row_ctx = (saHpiDomainEventTable_context *)rg->existing_row;
968 // saHpiDomainEventTable_context *undo_ctx = (saHpiDomainEventTable_context *)rg->undo_info;
969 netsnmp_request_group_item *current;
970- netsnmp_variable_list *var;
971 int rc;
972
973 rg->rg_void = rg->list->ri;
974@@ -887,7 +882,6 @@ void saHpiDomainEventTable_set_reserve2(
975 */
976 for( current = rg->list; current; current = current->next ) {
977
978- var = current->ri->requestvb;
979 rc = SNMP_ERR_NOERROR;
980
981 switch(current->tri->colnum) {
982@@ -919,7 +913,6 @@ void saHpiDomainEventTable_set_reserve2(
983 */
984 void saHpiDomainEventTable_set_action( netsnmp_request_group *rg )
985 {
986- netsnmp_variable_list *var;
987 // saHpiDomainEventTable_context *row_ctx = (saHpiDomainEventTable_context *)rg->existing_row;
988 // saHpiDomainEventTable_context *undo_ctx = (saHpiDomainEventTable_context *)rg->undo_info;
989 netsnmp_request_group_item *current;
990@@ -934,7 +927,6 @@ void saHpiDomainEventTable_set_action( n
991 */
992 for( current = rg->list; current; current = current->next ) {
993
994- var = current->ri->requestvb;
995
996 switch(current->tri->colnum) {
997
998@@ -985,7 +977,6 @@ void saHpiDomainEventTable_set_action( n
999 */
1000 void saHpiDomainEventTable_set_commit( netsnmp_request_group *rg )
1001 {
1002- netsnmp_variable_list *var;
1003 // saHpiDomainEventTable_context *row_ctx = (saHpiDomainEventTable_context *)rg->existing_row;
1004 // saHpiDomainEventTable_context *undo_ctx = (saHpiDomainEventTable_context *)rg->undo_info;
1005 netsnmp_request_group_item *current;
1006@@ -995,7 +986,6 @@ void saHpiDomainEventTable_set_commit( n
1007 */
1008 for( current = rg->list; current; current = current->next ) {
1009
1010- var = current->ri->requestvb;
1011
1012 switch(current->tri->colnum) {
1013
1014@@ -1020,7 +1010,6 @@ void saHpiDomainEventTable_set_commit( n
1015 */
1016 void saHpiDomainEventTable_set_free( netsnmp_request_group *rg )
1017 {
1018- netsnmp_variable_list *var;
1019 // saHpiDomainEventTable_context *row_ctx = (saHpiDomainEventTable_context *)rg->existing_row;
1020 // saHpiDomainEventTable_context *undo_ctx = (saHpiDomainEventTable_context *)rg->undo_info;
1021 netsnmp_request_group_item *current;
1022@@ -1030,7 +1019,6 @@ void saHpiDomainEventTable_set_free( net
1023 */
1024 for( current = rg->list; current; current = current->next ) {
1025
1026- var = current->ri->requestvb;
1027
1028 switch(current->tri->colnum) {
1029
1030@@ -1065,7 +1053,6 @@ void saHpiDomainEventTable_set_free( net
1031 */
1032 void saHpiDomainEventTable_set_undo( netsnmp_request_group *rg )
1033 {
1034- netsnmp_variable_list *var;
1035 // saHpiDomainEventTable_context *row_ctx = (saHpiDomainEventTable_context *)rg->existing_row;
1036 // saHpiDomainEventTable_context *undo_ctx = (saHpiDomainEventTable_context *)rg->undo_info;
1037 netsnmp_request_group_item *current;
1038@@ -1075,7 +1062,6 @@ void saHpiDomainEventTable_set_undo( net
1039 */
1040 for( current = rg->list; current; current = current->next ) {
1041
1042- var = current->ri->requestvb;
1043
1044 switch(current->tri->colnum) {
1045
1046Index: openhpi-subagent-2.3.4/src/saHpiDomainInfoTable.c
1047===================================================================
1048--- openhpi-subagent-2.3.4.orig/src/saHpiDomainInfoTable.c
1049+++ openhpi-subagent-2.3.4/src/saHpiDomainInfoTable.c
1050@@ -955,8 +955,6 @@ void saHpiDomainInfoTable_set_action( ne
1051 // saHpiDomainInfoTable_context *undo_ctx = (saHpiDomainInfoTable_context *)rg->undo_info;
1052 netsnmp_request_group_item *current;
1053
1054- int row_err = 0;
1055-
1056 subagent_lock(&hpi_lock_data);
1057
1058 /*
1059@@ -972,20 +970,20 @@ void saHpiDomainInfoTable_set_action( ne
1060 case COLUMN_SAHPIDOMAINTAGTEXTTYPE:
1061 /** SaHpiTextType = ASN_INTEGER */
1062 row_ctx->saHpiDomainTagTextType = *var->val.integer;
1063- row_err = set_table_domain_tag(row_ctx);
1064+ set_table_domain_tag(row_ctx);
1065 break;
1066
1067 case COLUMN_SAHPIDOMAINTAGTEXTLANGUAGE:
1068 /** SaHpiTextLanguage = ASN_INTEGER */
1069 row_ctx->saHpiDomainTagTextLanguage = *var->val.integer;
1070- row_err = set_table_domain_tag(row_ctx);
1071+ set_table_domain_tag(row_ctx);
1072 break;
1073
1074 case COLUMN_SAHPIDOMAINTAG:
1075 /** SaHpiText = ASN_OCTET_STR */
1076 memcpy(row_ctx->saHpiDomainTag,var->val.string,var->val_len);
1077 row_ctx->saHpiDomainTag_len = var->val_len;
1078- row_err = set_table_domain_tag(row_ctx);
1079+ set_table_domain_tag(row_ctx);
1080 break;
1081
1082 default: /** We shouldn't get here */
1083@@ -1016,7 +1014,6 @@ void saHpiDomainInfoTable_set_action( ne
1084 */
1085 void saHpiDomainInfoTable_set_commit( netsnmp_request_group *rg )
1086 {
1087- netsnmp_variable_list *var;
1088 // saHpiDomainInfoTable_context *row_ctx = (saHpiDomainInfoTable_context *)rg->existing_row;
1089 // saHpiDomainInfoTable_context *undo_ctx = (saHpiDomainInfoTable_context *)rg->undo_info;
1090 netsnmp_request_group_item *current;
1091@@ -1026,7 +1023,6 @@ void saHpiDomainInfoTable_set_commit( ne
1092 */
1093 for( current = rg->list; current; current = current->next ) {
1094
1095- var = current->ri->requestvb;
1096
1097 switch(current->tri->colnum) {
1098
1099@@ -1063,7 +1059,6 @@ void saHpiDomainInfoTable_set_commit( ne
1100 */
1101 void saHpiDomainInfoTable_set_free( netsnmp_request_group *rg )
1102 {
1103- netsnmp_variable_list *var;
1104 // saHpiDomainInfoTable_context *row_ctx = (saHpiDomainInfoTable_context *)rg->existing_row;
1105 // saHpiDomainInfoTable_context *undo_ctx = (saHpiDomainInfoTable_context *)rg->undo_info;
1106 netsnmp_request_group_item *current;
1107@@ -1073,7 +1068,6 @@ void saHpiDomainInfoTable_set_free( nets
1108 */
1109 for( current = rg->list; current; current = current->next ) {
1110
1111- var = current->ri->requestvb;
1112
1113 switch(current->tri->colnum) {
1114
1115@@ -1121,7 +1115,6 @@ void saHpiDomainInfoTable_set_free( nets
1116 */
1117 void saHpiDomainInfoTable_set_undo( netsnmp_request_group *rg )
1118 {
1119- netsnmp_variable_list *var;
1120 // saHpiDomainInfoTable_context *row_ctx = (saHpiDomainInfoTable_context *)rg->existing_row;
1121 // saHpiDomainInfoTable_context *undo_ctx = (saHpiDomainInfoTable_context *)rg->undo_info;
1122 netsnmp_request_group_item *current;
1123@@ -1131,7 +1124,6 @@ void saHpiDomainInfoTable_set_undo( nets
1124 */
1125 for( current = rg->list; current; current = current->next ) {
1126
1127- var = current->ri->requestvb;
1128
1129 switch(current->tri->colnum) {
1130
1131Index: openhpi-subagent-2.3.4/src/saHpiDomainReferenceTable.c
1132===================================================================
1133--- openhpi-subagent-2.3.4.orig/src/saHpiDomainReferenceTable.c
1134+++ openhpi-subagent-2.3.4/src/saHpiDomainReferenceTable.c
1135@@ -653,7 +653,6 @@ void saHpiDomainReferenceTable_set_reser
1136 // (saHpiDomainReferenceTable_context *)rg->existing_row;
1137 // saHpiDomainReferenceTable_context *undo_ctx =
1138 // (saHpiDomainReferenceTable_context *)rg->undo_info;
1139- netsnmp_variable_list *var;
1140 netsnmp_request_group_item *current;
1141 int rc;
1142
1143@@ -666,7 +665,6 @@ void saHpiDomainReferenceTable_set_reser
1144 */
1145 for( current = rg->list; current; current = current->next ) {
1146
1147- var = current->ri->requestvb;
1148 rc = SNMP_ERR_NOERROR;
1149
1150 switch(current->tri->colnum) {
1151@@ -693,7 +691,6 @@ void saHpiDomainReferenceTable_set_reser
1152 // saHpiDomainReferenceTable_context *row_ctx = (saHpiDomainReferenceTable_context *)rg->existing_row;
1153 // saHpiDomainReferenceTable_context *undo_ctx = (saHpiDomainReferenceTable_context *)rg->undo_info;
1154 netsnmp_request_group_item *current;
1155- netsnmp_variable_list *var;
1156 int rc;
1157
1158 rg->rg_void = rg->list->ri;
1159@@ -704,7 +701,6 @@ void saHpiDomainReferenceTable_set_reser
1160 */
1161 for( current = rg->list; current; current = current->next ) {
1162
1163- var = current->ri->requestvb;
1164 rc = SNMP_ERR_NOERROR;
1165
1166 switch(current->tri->colnum) {
1167@@ -736,7 +732,6 @@ void saHpiDomainReferenceTable_set_reser
1168 */
1169 void saHpiDomainReferenceTable_set_action( netsnmp_request_group *rg )
1170 {
1171- netsnmp_variable_list *var;
1172 // saHpiDomainReferenceTable_context *row_ctx = (saHpiDomainReferenceTable_context *)rg->existing_row;
1173 // saHpiDomainReferenceTable_context *undo_ctx = (saHpiDomainReferenceTable_context *)rg->undo_info;
1174 netsnmp_request_group_item *current;
1175@@ -751,7 +746,6 @@ void saHpiDomainReferenceTable_set_actio
1176 */
1177 for( current = rg->list; current; current = current->next ) {
1178
1179- var = current->ri->requestvb;
1180
1181 switch(current->tri->colnum) {
1182
1183@@ -783,7 +777,6 @@ void saHpiDomainReferenceTable_set_actio
1184 */
1185 void saHpiDomainReferenceTable_set_commit( netsnmp_request_group *rg )
1186 {
1187- netsnmp_variable_list *var;
1188 // saHpiDomainReferenceTable_context *row_ctx = (saHpiDomainReferenceTable_context *)rg->existing_row;
1189 // saHpiDomainReferenceTable_context *undo_ctx = (saHpiDomainReferenceTable_context *)rg->undo_info;
1190 netsnmp_request_group_item *current;
1191@@ -793,7 +786,6 @@ void saHpiDomainReferenceTable_set_commi
1192 */
1193 for( current = rg->list; current; current = current->next ) {
1194
1195- var = current->ri->requestvb;
1196
1197 switch(current->tri->colnum) {
1198
1199@@ -818,7 +810,6 @@ void saHpiDomainReferenceTable_set_commi
1200 */
1201 void saHpiDomainReferenceTable_set_free( netsnmp_request_group *rg )
1202 {
1203- netsnmp_variable_list *var;
1204 // saHpiDomainReferenceTable_context *row_ctx = (saHpiDomainReferenceTable_context *)rg->existing_row;
1205 // saHpiDomainReferenceTable_context *undo_ctx = (saHpiDomainReferenceTable_context *)rg->undo_info;
1206 netsnmp_request_group_item *current;
1207@@ -828,7 +819,6 @@ void saHpiDomainReferenceTable_set_free(
1208 */
1209 for( current = rg->list; current; current = current->next ) {
1210
1211- var = current->ri->requestvb;
1212
1213 switch(current->tri->colnum) {
1214
1215@@ -863,7 +853,6 @@ void saHpiDomainReferenceTable_set_free(
1216 */
1217 void saHpiDomainReferenceTable_set_undo( netsnmp_request_group *rg )
1218 {
1219- netsnmp_variable_list *var;
1220 // saHpiDomainReferenceTable_context *row_ctx = (saHpiDomainReferenceTable_context *)rg->existing_row;
1221 // saHpiDomainReferenceTable_context *undo_ctx = (saHpiDomainReferenceTable_context *)rg->undo_info;
1222 netsnmp_request_group_item *current;
1223@@ -873,7 +862,6 @@ void saHpiDomainReferenceTable_set_undo(
1224 */
1225 for( current = rg->list; current; current = current->next ) {
1226
1227- var = current->ri->requestvb;
1228
1229 switch(current->tri->colnum) {
1230
1231Index: openhpi-subagent-2.3.4/src/saHpiEventLogInfoTable.c
1232===================================================================
1233--- openhpi-subagent-2.3.4.orig/src/saHpiEventLogInfoTable.c
1234+++ openhpi-subagent-2.3.4/src/saHpiEventLogInfoTable.c
1235@@ -416,7 +416,6 @@ int event_log_info_clear (saHpiEventLogI
1236 SaHpiSessionIdT session_id;
1237 SaHpiResourceIdT resource_id;
1238
1239- int rv = SNMP_ERR_NOERROR;
1240
1241 DEBUGMSGTL ((AGENT, "event_log_info_clear, called\n"));
1242
1243@@ -444,7 +443,7 @@ int event_log_info_clear (saHpiEventLogI
1244 }
1245
1246 /* it succeeded clear the underlying tables */
1247- rv = event_log_clear(session_id, resource_id, MIB_FALSE);
1248+ event_log_clear(session_id, resource_id, MIB_FALSE);
1249
1250 return SNMP_ERR_NOERROR;
1251
1252@@ -1230,7 +1229,6 @@ void saHpiEventLogInfoTable_set_reserve2
1253 // saHpiEventLogInfoTable_context *row_ctx = (saHpiEventLogInfoTable_context *)rg->existing_row;
1254 //saHpiEventLogInfoTable_context *undo_ctx = (saHpiEventLogInfoTable_context *)rg->undo_info;
1255 netsnmp_request_group_item *current;
1256- netsnmp_variable_list *var;
1257 int rc;
1258
1259 rg->rg_void = rg->list->ri;
1260@@ -1241,7 +1239,6 @@ void saHpiEventLogInfoTable_set_reserve2
1261 */
1262 for( current = rg->list; current; current = current->next ) {
1263
1264- var = current->ri->requestvb;
1265 rc = SNMP_ERR_NOERROR;
1266
1267 switch(current->tri->colnum) {
1268@@ -1395,7 +1392,6 @@ void saHpiEventLogInfoTable_set_action(
1269 */
1270 void saHpiEventLogInfoTable_set_commit( netsnmp_request_group *rg )
1271 {
1272- netsnmp_variable_list *var;
1273 // saHpiEventLogInfoTable_context *row_ctx = (saHpiEventLogInfoTable_context *)rg->existing_row;
1274 // saHpiEventLogInfoTable_context *undo_ctx = (saHpiEventLogInfoTable_context *)rg->undo_info;
1275 netsnmp_request_group_item *current;
1276@@ -1405,7 +1401,6 @@ void saHpiEventLogInfoTable_set_commit(
1277 */
1278 for( current = rg->list; current; current = current->next ) {
1279
1280- var = current->ri->requestvb;
1281
1282 switch(current->tri->colnum) {
1283
1284@@ -1446,7 +1441,6 @@ void saHpiEventLogInfoTable_set_commit(
1285 */
1286 void saHpiEventLogInfoTable_set_free( netsnmp_request_group *rg )
1287 {
1288- netsnmp_variable_list *var;
1289 // saHpiEventLogInfoTable_context *row_ctx = (saHpiEventLogInfoTable_context *)rg->existing_row;
1290 // saHpiEventLogInfoTable_context *undo_ctx = (saHpiEventLogInfoTable_context *)rg->undo_info;
1291 netsnmp_request_group_item *current;
1292@@ -1456,7 +1450,6 @@ void saHpiEventLogInfoTable_set_free( ne
1293 */
1294 for( current = rg->list; current; current = current->next ) {
1295
1296- var = current->ri->requestvb;
1297
1298 switch(current->tri->colnum) {
1299
1300@@ -1509,7 +1502,6 @@ void saHpiEventLogInfoTable_set_free( ne
1301 */
1302 void saHpiEventLogInfoTable_set_undo( netsnmp_request_group *rg )
1303 {
1304- netsnmp_variable_list *var;
1305 // saHpiEventLogInfoTable_context *row_ctx = (saHpiEventLogInfoTable_context *)rg->existing_row;
1306 // saHpiEventLogInfoTable_context *undo_ctx = (saHpiEventLogInfoTable_context *)rg->undo_info;
1307 netsnmp_request_group_item *current;
1308@@ -1519,7 +1511,6 @@ void saHpiEventLogInfoTable_set_undo( ne
1309 */
1310 for( current = rg->list; current; current = current->next ) {
1311
1312- var = current->ri->requestvb;
1313
1314 switch(current->tri->colnum) {
1315
1316Index: openhpi-subagent-2.3.4/src/saHpiEventLogTable.c
1317===================================================================
1318--- openhpi-subagent-2.3.4.orig/src/saHpiEventLogTable.c
1319+++ openhpi-subagent-2.3.4/src/saHpiEventLogTable.c
1320@@ -1116,7 +1116,6 @@ void saHpiEventLogTable_set_reserve1( ne
1321 // (saHpiEventLogTable_context *)rg->existing_row;
1322 // saHpiEventLogTable_context *undo_ctx =
1323 // (saHpiEventLogTable_context *)rg->undo_info;
1324- netsnmp_variable_list *var;
1325 netsnmp_request_group_item *current;
1326 int rc;
1327
1328@@ -1129,7 +1128,6 @@ void saHpiEventLogTable_set_reserve1( ne
1329 */
1330 for( current = rg->list; current; current = current->next ) {
1331
1332- var = current->ri->requestvb;
1333 rc = SNMP_ERR_NOERROR;
1334
1335 switch(current->tri->colnum) {
1336@@ -1156,7 +1154,6 @@ void saHpiEventLogTable_set_reserve2( ne
1337 // saHpiEventLogTable_context *row_ctx = (saHpiEventLogTable_context *)rg->existing_row;
1338 // saHpiEventLogTable_context *undo_ctx = (saHpiEventLogTable_context *)rg->undo_info;
1339 netsnmp_request_group_item *current;
1340- netsnmp_variable_list *var;
1341 int rc;
1342
1343 rg->rg_void = rg->list->ri;
1344@@ -1167,7 +1164,6 @@ void saHpiEventLogTable_set_reserve2( ne
1345 */
1346 for( current = rg->list; current; current = current->next ) {
1347
1348- var = current->ri->requestvb;
1349 rc = SNMP_ERR_NOERROR;
1350
1351 switch(current->tri->colnum) {
1352@@ -1199,7 +1195,6 @@ void saHpiEventLogTable_set_reserve2( ne
1353 */
1354 void saHpiEventLogTable_set_action( netsnmp_request_group *rg )
1355 {
1356- netsnmp_variable_list *var;
1357 // saHpiEventLogTable_context *row_ctx = (saHpiEventLogTable_context *)rg->existing_row;
1358 // saHpiEventLogTable_context *undo_ctx = (saHpiEventLogTable_context *)rg->undo_info;
1359 netsnmp_request_group_item *current;
1360@@ -1213,7 +1208,6 @@ void saHpiEventLogTable_set_action( nets
1361 */
1362 for( current = rg->list; current; current = current->next ) {
1363
1364- var = current->ri->requestvb;
1365
1366 switch(current->tri->colnum) {
1367
1368@@ -1250,7 +1244,6 @@ void saHpiEventLogTable_set_action( nets
1369 */
1370 void saHpiEventLogTable_set_commit( netsnmp_request_group *rg )
1371 {
1372- netsnmp_variable_list *var;
1373 // saHpiEventLogTable_context *row_ctx = (saHpiEventLogTable_context *)rg->existing_row;
1374 // saHpiEventLogTable_context *undo_ctx = (saHpiEventLogTable_context *)rg->undo_info;
1375 netsnmp_request_group_item *current;
1376@@ -1260,7 +1253,6 @@ void saHpiEventLogTable_set_commit( nets
1377 */
1378 for( current = rg->list; current; current = current->next ) {
1379
1380- var = current->ri->requestvb;
1381
1382 switch(current->tri->colnum) {
1383
1384@@ -1285,7 +1277,6 @@ void saHpiEventLogTable_set_commit( nets
1385 */
1386 void saHpiEventLogTable_set_free( netsnmp_request_group *rg )
1387 {
1388- netsnmp_variable_list *var;
1389 // saHpiEventLogTable_context *row_ctx = (saHpiEventLogTable_context *)rg->existing_row;
1390 // saHpiEventLogTable_context *undo_ctx = (saHpiEventLogTable_context *)rg->undo_info;
1391 netsnmp_request_group_item *current;
1392@@ -1295,7 +1286,6 @@ void saHpiEventLogTable_set_free( netsnm
1393 */
1394 for( current = rg->list; current; current = current->next ) {
1395
1396- var = current->ri->requestvb;
1397
1398 switch(current->tri->colnum) {
1399
1400@@ -1332,7 +1322,6 @@ void saHpiEventLogTable_set_free( netsnm
1401 */
1402 void saHpiEventLogTable_set_undo( netsnmp_request_group *rg )
1403 {
1404- netsnmp_variable_list *var;
1405 // saHpiEventLogTable_context *row_ctx = (saHpiEventLogTable_context *)rg->existing_row;
1406 // saHpiEventLogTable_context *undo_ctx = (saHpiEventLogTable_context *)rg->undo_info;
1407 netsnmp_request_group_item *current;
1408@@ -1342,7 +1331,6 @@ void saHpiEventLogTable_set_undo( netsnm
1409 */
1410 for( current = rg->list; current; current = current->next ) {
1411
1412- var = current->ri->requestvb;
1413
1414 switch(current->tri->colnum) {
1415
1416Index: openhpi-subagent-2.3.4/src/saHpiEventTable.c
1417===================================================================
1418--- openhpi-subagent-2.3.4.orig/src/saHpiEventTable.c
1419+++ openhpi-subagent-2.3.4/src/saHpiEventTable.c
1420@@ -883,7 +883,6 @@ void saHpiEventTable_set_reserve1( netsn
1421 // (saHpiEventTable_context *)rg->existing_row;
1422 // saHpiEventTable_context *undo_ctx =
1423 // (saHpiEventTable_context *)rg->undo_info;
1424- netsnmp_variable_list *var;
1425 netsnmp_request_group_item *current;
1426 int rc;
1427
1428@@ -896,7 +895,6 @@ void saHpiEventTable_set_reserve1( netsn
1429 */
1430 for( current = rg->list; current; current = current->next ) {
1431
1432- var = current->ri->requestvb;
1433 rc = SNMP_ERR_NOERROR;
1434
1435 switch(current->tri->colnum) {
1436@@ -923,7 +921,6 @@ void saHpiEventTable_set_reserve2( netsn
1437 // saHpiEventTable_context *row_ctx = (saHpiEventTable_context *)rg->existing_row;
1438 // saHpiEventTable_context *undo_ctx = (saHpiEventTable_context *)rg->undo_info;
1439 netsnmp_request_group_item *current;
1440- netsnmp_variable_list *var;
1441 int rc;
1442
1443 rg->rg_void = rg->list->ri;
1444@@ -934,7 +931,6 @@ void saHpiEventTable_set_reserve2( netsn
1445 */
1446 for( current = rg->list; current; current = current->next ) {
1447
1448- var = current->ri->requestvb;
1449 rc = SNMP_ERR_NOERROR;
1450
1451 switch(current->tri->colnum) {
1452@@ -966,7 +962,6 @@ void saHpiEventTable_set_reserve2( netsn
1453 */
1454 void saHpiEventTable_set_action( netsnmp_request_group *rg )
1455 {
1456- netsnmp_variable_list *var;
1457 // saHpiEventTable_context *row_ctx = (saHpiEventTable_context *)rg->existing_row;
1458 // saHpiEventTable_context *undo_ctx = (saHpiEventTable_context *)rg->undo_info;
1459 netsnmp_request_group_item *current;
1460@@ -980,7 +975,6 @@ void saHpiEventTable_set_action( netsnmp
1461 */
1462 for( current = rg->list; current; current = current->next ) {
1463
1464- var = current->ri->requestvb;
1465
1466 switch(current->tri->colnum) {
1467
1468@@ -1017,7 +1011,6 @@ void saHpiEventTable_set_action( netsnmp
1469 */
1470 void saHpiEventTable_set_commit( netsnmp_request_group *rg )
1471 {
1472- netsnmp_variable_list *var;
1473 // saHpiEventTable_context *row_ctx = (saHpiEventTable_context *)rg->existing_row;
1474 // saHpiEventTable_context *undo_ctx = (saHpiEventTable_context *)rg->undo_info;
1475 netsnmp_request_group_item *current;
1476@@ -1027,7 +1020,6 @@ void saHpiEventTable_set_commit( netsnmp
1477 */
1478 for( current = rg->list; current; current = current->next ) {
1479
1480- var = current->ri->requestvb;
1481
1482 switch(current->tri->colnum) {
1483
1484@@ -1052,7 +1044,6 @@ void saHpiEventTable_set_commit( netsnmp
1485 */
1486 void saHpiEventTable_set_free( netsnmp_request_group *rg )
1487 {
1488- netsnmp_variable_list *var;
1489 // saHpiEventTable_context *row_ctx = (saHpiEventTable_context *)rg->existing_row;
1490 // saHpiEventTable_context *undo_ctx = (saHpiEventTable_context *)rg->undo_info;
1491 netsnmp_request_group_item *current;
1492@@ -1062,7 +1053,6 @@ void saHpiEventTable_set_free( netsnmp_r
1493 */
1494 for( current = rg->list; current; current = current->next ) {
1495
1496- var = current->ri->requestvb;
1497
1498 switch(current->tri->colnum) {
1499
1500@@ -1099,7 +1089,6 @@ void saHpiEventTable_set_free( netsnmp_r
1501 */
1502 void saHpiEventTable_set_undo( netsnmp_request_group *rg )
1503 {
1504- netsnmp_variable_list *var;
1505 // saHpiEventTable_context *row_ctx = (saHpiEventTable_context *)rg->existing_row;
1506 // saHpiEventTable_context *undo_ctx = (saHpiEventTable_context *)rg->undo_info;
1507 netsnmp_request_group_item *current;
1508@@ -1109,7 +1098,6 @@ void saHpiEventTable_set_undo( netsnmp_r
1509 */
1510 for( current = rg->list; current; current = current->next ) {
1511
1512- var = current->ri->requestvb;
1513
1514 switch(current->tri->colnum) {
1515
1516Index: openhpi-subagent-2.3.4/src/saHpiFieldTable.c
1517===================================================================
1518--- openhpi-subagent-2.3.4.orig/src/saHpiFieldTable.c
1519+++ openhpi-subagent-2.3.4/src/saHpiFieldTable.c
1520@@ -1441,7 +1441,6 @@ void saHpiFieldTable_set_reserve2( netsn
1521 // saHpiFieldTable_context *row_ctx = (saHpiFieldTable_context *)rg->existing_row;
1522 // saHpiFieldTable_context *undo_ctx = (saHpiFieldTable_context *)rg->undo_info;
1523 netsnmp_request_group_item *current;
1524- netsnmp_variable_list *var;
1525 int rc;
1526
1527 DEBUGMSGTL ((AGENT, "saHpiFieldTable_set_reserve2, called\n"));
1528@@ -1454,7 +1453,6 @@ void saHpiFieldTable_set_reserve2( netsn
1529 */
1530 for( current = rg->list; current; current = current->next ) {
1531
1532- var = current->ri->requestvb;
1533 rc = SNMP_ERR_NOERROR;
1534
1535 switch(current->tri->colnum) {
1536@@ -1666,7 +1664,6 @@ void saHpiFieldTable_set_action( netsnmp
1537 */
1538 void saHpiFieldTable_set_commit( netsnmp_request_group *rg )
1539 {
1540- netsnmp_variable_list *var;
1541 // saHpiFieldTable_context *row_ctx = (saHpiFieldTable_context *)rg->existing_row;
1542 // saHpiFieldTable_context *undo_ctx = (saHpiFieldTable_context *)rg->undo_info;
1543 netsnmp_request_group_item *current;
1544@@ -1678,7 +1675,6 @@ void saHpiFieldTable_set_commit( netsnmp
1545 */
1546 for( current = rg->list; current; current = current->next ) {
1547
1548- var = current->ri->requestvb;
1549
1550 switch(current->tri->colnum) {
1551
1552@@ -1723,7 +1719,6 @@ void saHpiFieldTable_set_commit( netsnmp
1553 */
1554 void saHpiFieldTable_set_free( netsnmp_request_group *rg )
1555 {
1556- netsnmp_variable_list *var;
1557 // saHpiFieldTable_context *row_ctx = (saHpiFieldTable_context *)rg->existing_row;
1558 // saHpiFieldTable_context *undo_ctx = (saHpiFieldTable_context *)rg->undo_info;
1559 netsnmp_request_group_item *current;
1560@@ -1735,7 +1730,6 @@ void saHpiFieldTable_set_free( netsnmp_r
1561 */
1562 for( current = rg->list; current; current = current->next ) {
1563
1564- var = current->ri->requestvb;
1565
1566 switch(current->tri->colnum) {
1567
1568@@ -1792,7 +1786,6 @@ void saHpiFieldTable_set_free( netsnmp_r
1569 */
1570 void saHpiFieldTable_set_undo( netsnmp_request_group *rg )
1571 {
1572- netsnmp_variable_list *var;
1573 // saHpiFieldTable_context *row_ctx = (saHpiFieldTable_context *)rg->existing_row;
1574 // saHpiFieldTable_context *undo_ctx = (saHpiFieldTable_context *)rg->undo_info;
1575 netsnmp_request_group_item *current;
1576@@ -1804,7 +1797,6 @@ void saHpiFieldTable_set_undo( netsnmp_r
1577 */
1578 for( current = rg->list; current; current = current->next ) {
1579
1580- var = current->ri->requestvb;
1581
1582 switch(current->tri->colnum) {
1583
1584Index: openhpi-subagent-2.3.4/src/saHpiHotSwapEventLogTable.c
1585===================================================================
1586--- openhpi-subagent-2.3.4.orig/src/saHpiHotSwapEventLogTable.c
1587+++ openhpi-subagent-2.3.4/src/saHpiHotSwapEventLogTable.c
1588@@ -103,7 +103,6 @@ SaErrorT populate_saHpiHotSwapEventLogTa
1589 oid * this_child_oid,
1590 size_t *this_child_oid_len)
1591 {
1592- SaErrorT rv = SA_OK;
1593
1594 oid hotswap_evt_oid[HOTSWAP_EVENT_LOG_INDEX_NR];
1595 netsnmp_index hotswap_evt_idx;
1596@@ -155,7 +154,7 @@ SaErrorT populate_saHpiHotSwapEventLogTa
1597 /* create full oid on This row for parent RowPointer */
1598 column[0] = 1;
1599 column[1] = COLUMN_SAHPIHOTSWAPEVENTLOGTIMESTAMP;
1600- memset(this_child_oid, 0, sizeof(this_child_oid));
1601+ memset(this_child_oid, 0, MAX_OID_LEN);
1602 build_full_oid(saHpiHotSwapEventLogTable_oid, saHpiHotSwapEventLogTable_oid_len,
1603 column, column_len,
1604 &hotswap_evt_idx,
1605@@ -176,7 +175,7 @@ SaErrorT populate_saHpiHotSwapEventLogTa
1606
1607 if (!hotswap_evt_ctx) {
1608 snmp_log (LOG_ERR, "Not enough memory for a Hot Swap Event Log row!");
1609- rv = AGENT_ERR_INTERNAL_ERROR;
1610+ return AGENT_ERR_INTERNAL_ERROR;
1611 }
1612
1613 /** SaHpiTime = ASN_OCTET_STR */
1614@@ -219,7 +218,6 @@ SaErrorT hotswap_event_log_clear(SaHpiSe
1615 {
1616 oid hotswap_evt_oid[HOTSWAP_EVENT_LOG_INDEX_NR];
1617 netsnmp_index hotswap_evt_idx;
1618- netsnmp_index *hotswap_index;
1619 saHpiHotSwapEventLogTable_context *hotswap_evt_ctx;
1620
1621 DR_XREF *dr_entry;
1622@@ -250,7 +248,7 @@ SaErrorT hotswap_event_log_clear(SaHpiSe
1623 /* assign the indices to the index */
1624 hotswap_evt_idx.oids = (oid *) & hotswap_evt_oid;
1625
1626- hotswap_index = CONTAINER_FIRST(cb.container);
1627+ CONTAINER_FIRST(cb.container);
1628 hotswap_evt_ctx = CONTAINER_FIND(cb.container, &hotswap_evt_idx);
1629
1630 if (!hotswap_evt_ctx) {
1631@@ -843,7 +841,6 @@ void saHpiHotSwapEventLogTable_set_reser
1632 // (saHpiHotSwapEventLogTable_context *)rg->existing_row;
1633 // saHpiHotSwapEventLogTable_context *undo_ctx =
1634 // (saHpiHotSwapEventLogTable_context *)rg->undo_info;
1635- netsnmp_variable_list *var;
1636 netsnmp_request_group_item *current;
1637 int rc;
1638
1639@@ -856,7 +853,6 @@ void saHpiHotSwapEventLogTable_set_reser
1640 */
1641 for( current = rg->list; current; current = current->next ) {
1642
1643- var = current->ri->requestvb;
1644 rc = SNMP_ERR_NOERROR;
1645
1646 switch(current->tri->colnum) {
1647@@ -883,7 +879,6 @@ void saHpiHotSwapEventLogTable_set_reser
1648 // saHpiHotSwapEventLogTable_context *row_ctx = (saHpiHotSwapEventLogTable_context *)rg->existing_row;
1649 // saHpiHotSwapEventLogTable_context *undo_ctx = (saHpiHotSwapEventLogTable_context *)rg->undo_info;
1650 netsnmp_request_group_item *current;
1651- netsnmp_variable_list *var;
1652 int rc;
1653
1654 rg->rg_void = rg->list->ri;
1655@@ -894,7 +889,6 @@ void saHpiHotSwapEventLogTable_set_reser
1656 */
1657 for( current = rg->list; current; current = current->next ) {
1658
1659- var = current->ri->requestvb;
1660 rc = SNMP_ERR_NOERROR;
1661
1662 switch(current->tri->colnum) {
1663@@ -926,7 +920,6 @@ void saHpiHotSwapEventLogTable_set_reser
1664 */
1665 void saHpiHotSwapEventLogTable_set_action( netsnmp_request_group *rg )
1666 {
1667- netsnmp_variable_list *var;
1668 // saHpiHotSwapEventLogTable_context *row_ctx = (saHpiHotSwapEventLogTable_context *)rg->existing_row;
1669 // saHpiHotSwapEventLogTable_context *undo_ctx = (saHpiHotSwapEventLogTable_context *)rg->undo_info;
1670 netsnmp_request_group_item *current;
1671@@ -941,7 +934,6 @@ void saHpiHotSwapEventLogTable_set_actio
1672 */
1673 for( current = rg->list; current; current = current->next ) {
1674
1675- var = current->ri->requestvb;
1676
1677 switch(current->tri->colnum) {
1678
1679@@ -982,7 +974,6 @@ void saHpiHotSwapEventLogTable_set_actio
1680 */
1681 void saHpiHotSwapEventLogTable_set_commit( netsnmp_request_group *rg )
1682 {
1683- netsnmp_variable_list *var;
1684 // saHpiHotSwapEventLogTable_context *row_ctx = (saHpiHotSwapEventLogTable_context *)rg->existing_row;
1685 // saHpiHotSwapEventLogTable_context *undo_ctx = (saHpiHotSwapEventLogTable_context *)rg->undo_info;
1686 netsnmp_request_group_item *current;
1687@@ -992,7 +983,6 @@ void saHpiHotSwapEventLogTable_set_commi
1688 */
1689 for( current = rg->list; current; current = current->next ) {
1690
1691- var = current->ri->requestvb;
1692
1693 switch(current->tri->colnum) {
1694
1695@@ -1017,7 +1007,6 @@ void saHpiHotSwapEventLogTable_set_commi
1696 */
1697 void saHpiHotSwapEventLogTable_set_free( netsnmp_request_group *rg )
1698 {
1699- netsnmp_variable_list *var;
1700 // saHpiHotSwapEventLogTable_context *row_ctx = (saHpiHotSwapEventLogTable_context *)rg->existing_row;
1701 // saHpiHotSwapEventLogTable_context *undo_ctx = (saHpiHotSwapEventLogTable_context *)rg->undo_info;
1702 netsnmp_request_group_item *current;
1703@@ -1027,7 +1016,6 @@ void saHpiHotSwapEventLogTable_set_free(
1704 */
1705 for( current = rg->list; current; current = current->next ) {
1706
1707- var = current->ri->requestvb;
1708
1709 switch(current->tri->colnum) {
1710
1711@@ -1063,7 +1051,6 @@ void saHpiHotSwapEventLogTable_set_free(
1712 */
1713 void saHpiHotSwapEventLogTable_set_undo( netsnmp_request_group *rg )
1714 {
1715- netsnmp_variable_list *var;
1716 // saHpiHotSwapEventLogTable_context *row_ctx = (saHpiHotSwapEventLogTable_context *)rg->existing_row;
1717 // saHpiHotSwapEventLogTable_context *undo_ctx = (saHpiHotSwapEventLogTable_context *)rg->undo_info;
1718 netsnmp_request_group_item *current;
1719@@ -1073,7 +1060,6 @@ void saHpiHotSwapEventLogTable_set_undo(
1720 */
1721 for( current = rg->list; current; current = current->next ) {
1722
1723- var = current->ri->requestvb;
1724
1725 switch(current->tri->colnum) {
1726
1727Index: openhpi-subagent-2.3.4/src/saHpiHotSwapEventTable.c
1728===================================================================
1729--- openhpi-subagent-2.3.4.orig/src/saHpiHotSwapEventTable.c
1730+++ openhpi-subagent-2.3.4/src/saHpiHotSwapEventTable.c
1731@@ -103,7 +103,6 @@ SaErrorT populate_saHpiHotSwapEventTable
1732 oid * this_child_oid,
1733 size_t *this_child_oid_len)
1734 {
1735- SaErrorT rv = SA_OK;
1736 int new_row = MIB_FALSE;
1737
1738 oid hotswap_evt_oid[HOTSWAP_EVENT_INDEX_NR];
1739@@ -161,7 +160,7 @@ SaErrorT populate_saHpiHotSwapEventTable
1740 }
1741 if (!hotswap_evt_ctx) {
1742 snmp_log (LOG_ERR, "Not enough memory for a HotSwap Event row!");
1743- rv = AGENT_ERR_INTERNAL_ERROR;
1744+ return AGENT_ERR_INTERNAL_ERROR;
1745 }
1746
1747 /** SaHpiEntryId = ASN_UNSIGNED */
1748@@ -187,7 +186,7 @@ SaErrorT populate_saHpiHotSwapEventTable
1749 /* create full oid on This row for parent RowPointer */
1750 column[0] = 1;
1751 column[1] = COLUMN_SAHPIHOTSWAPEVENTTIMESTAMP;
1752- memset(this_child_oid, 0, sizeof(this_child_oid));
1753+ memset(this_child_oid, 0, MAX_OID_LEN);
1754 build_full_oid(saHpiHotSwapEventTable_oid, saHpiHotSwapEventTable_oid_len,
1755 column, column_len,
1756 &hotswap_evt_idx,
1757@@ -206,7 +205,6 @@ SaErrorT async_hotswap_event_add(SaHpiSe
1758 oid * this_child_oid,
1759 size_t *this_child_oid_len)
1760 {
1761- SaErrorT rv = SA_OK;
1762 int new_row = MIB_FALSE;
1763
1764 oid hotswap_evt_oid[HOTSWAP_EVENT_INDEX_NR];
1765@@ -274,7 +272,7 @@ SaErrorT async_hotswap_event_add(SaHpiSe
1766 }
1767 if (!hotswap_evt_ctx) {
1768 snmp_log (LOG_ERR, "Not enough memory for a HotSwap Event row!");
1769- rv = AGENT_ERR_INTERNAL_ERROR;
1770+ return AGENT_ERR_INTERNAL_ERROR;
1771 }
1772
1773 /** SaHpiEntryId = ASN_UNSIGNED */
1774@@ -300,7 +298,7 @@ SaErrorT async_hotswap_event_add(SaHpiSe
1775 /* create full oid on This row for parent RowPointer */
1776 column[0] = 1;
1777 column[1] = COLUMN_SAHPIHOTSWAPEVENTTIMESTAMP;
1778- memset(this_child_oid, 0, sizeof(this_child_oid));
1779+ memset(this_child_oid, 0, MAX_OID_LEN);
1780 build_full_oid(saHpiHotSwapEventTable_oid, saHpiHotSwapEventTable_oid_len,
1781 column, column_len,
1782 &hotswap_evt_idx,
1783@@ -872,7 +870,6 @@ void saHpiHotSwapEventTable_set_reserve1
1784 // (saHpiHotSwapEventTable_context *)rg->existing_row;
1785 // saHpiHotSwapEventTable_context *undo_ctx =
1786 // (saHpiHotSwapEventTable_context *)rg->undo_info;
1787- netsnmp_variable_list *var;
1788 netsnmp_request_group_item *current;
1789 int rc;
1790
1791@@ -885,7 +882,6 @@ void saHpiHotSwapEventTable_set_reserve1
1792 */
1793 for( current = rg->list; current; current = current->next ) {
1794
1795- var = current->ri->requestvb;
1796 rc = SNMP_ERR_NOERROR;
1797
1798 switch(current->tri->colnum) {
1799@@ -912,7 +908,6 @@ void saHpiHotSwapEventTable_set_reserve2
1800 // saHpiHotSwapEventTable_context *row_ctx = (saHpiHotSwapEventTable_context *)rg->existing_row;
1801 // saHpiHotSwapEventTable_context *undo_ctx = (saHpiHotSwapEventTable_context *)rg->undo_info;
1802 netsnmp_request_group_item *current;
1803- netsnmp_variable_list *var;
1804 int rc;
1805
1806 rg->rg_void = rg->list->ri;
1807@@ -923,7 +918,6 @@ void saHpiHotSwapEventTable_set_reserve2
1808 */
1809 for( current = rg->list; current; current = current->next ) {
1810
1811- var = current->ri->requestvb;
1812 rc = SNMP_ERR_NOERROR;
1813
1814 switch(current->tri->colnum) {
1815@@ -955,7 +949,6 @@ void saHpiHotSwapEventTable_set_reserve2
1816 */
1817 void saHpiHotSwapEventTable_set_action( netsnmp_request_group *rg )
1818 {
1819- netsnmp_variable_list *var;
1820 // saHpiHotSwapEventTable_context *row_ctx = (saHpiHotSwapEventTable_context *)rg->existing_row;
1821 // saHpiHotSwapEventTable_context *undo_ctx = (saHpiHotSwapEventTable_context *)rg->undo_info;
1822 netsnmp_request_group_item *current;
1823@@ -970,7 +963,6 @@ void saHpiHotSwapEventTable_set_action(
1824 */
1825 for( current = rg->list; current; current = current->next ) {
1826
1827- var = current->ri->requestvb;
1828
1829 switch(current->tri->colnum) {
1830
1831@@ -1011,7 +1003,6 @@ void saHpiHotSwapEventTable_set_action(
1832 */
1833 void saHpiHotSwapEventTable_set_commit( netsnmp_request_group *rg )
1834 {
1835- netsnmp_variable_list *var;
1836 // saHpiHotSwapEventTable_context *row_ctx = (saHpiHotSwapEventTable_context *)rg->existing_row;
1837 // saHpiHotSwapEventTable_context *undo_ctx = (saHpiHotSwapEventTable_context *)rg->undo_info;
1838 netsnmp_request_group_item *current;
1839@@ -1021,7 +1012,6 @@ void saHpiHotSwapEventTable_set_commit(
1840 */
1841 for( current = rg->list; current; current = current->next ) {
1842
1843- var = current->ri->requestvb;
1844
1845 switch(current->tri->colnum) {
1846
1847@@ -1046,7 +1036,6 @@ void saHpiHotSwapEventTable_set_commit(
1848 */
1849 void saHpiHotSwapEventTable_set_free( netsnmp_request_group *rg )
1850 {
1851- netsnmp_variable_list *var;
1852 // saHpiHotSwapEventTable_context *row_ctx = (saHpiHotSwapEventTable_context *)rg->existing_row;
1853 // saHpiHotSwapEventTable_context *undo_ctx = (saHpiHotSwapEventTable_context *)rg->undo_info;
1854 netsnmp_request_group_item *current;
1855@@ -1056,7 +1045,6 @@ void saHpiHotSwapEventTable_set_free( ne
1856 */
1857 for( current = rg->list; current; current = current->next ) {
1858
1859- var = current->ri->requestvb;
1860
1861 switch(current->tri->colnum) {
1862
1863@@ -1092,7 +1080,6 @@ void saHpiHotSwapEventTable_set_free( ne
1864 */
1865 void saHpiHotSwapEventTable_set_undo( netsnmp_request_group *rg )
1866 {
1867- netsnmp_variable_list *var;
1868 // saHpiHotSwapEventTable_context *row_ctx = (saHpiHotSwapEventTable_context *)rg->existing_row;
1869 // saHpiHotSwapEventTable_context *undo_ctx = (saHpiHotSwapEventTable_context *)rg->undo_info;
1870 netsnmp_request_group_item *current;
1871@@ -1102,7 +1089,6 @@ void saHpiHotSwapEventTable_set_undo( ne
1872 */
1873 for( current = rg->list; current; current = current->next ) {
1874
1875- var = current->ri->requestvb;
1876
1877 switch(current->tri->colnum) {
1878
1879Index: openhpi-subagent-2.3.4/src/saHpiHotSwapTable.c
1880===================================================================
1881--- openhpi-subagent-2.3.4.orig/src/saHpiHotSwapTable.c
1882+++ openhpi-subagent-2.3.4/src/saHpiHotSwapTable.c
1883@@ -1255,7 +1255,6 @@ void saHpiHotSwapTable_set_action( netsn
1884 */
1885 void saHpiHotSwapTable_set_commit( netsnmp_request_group *rg )
1886 {
1887- netsnmp_variable_list *var;
1888 // saHpiHotSwapTable_context *row_ctx = (saHpiHotSwapTable_context *)rg->existing_row;
1889 // saHpiHotSwapTable_context *undo_ctx = (saHpiHotSwapTable_context *)rg->undo_info;
1890 netsnmp_request_group_item *current;
1891@@ -1267,7 +1266,6 @@ void saHpiHotSwapTable_set_commit( netsn
1892 */
1893 for( current = rg->list; current; current = current->next ) {
1894
1895- var = current->ri->requestvb;
1896
1897 switch(current->tri->colnum) {
1898
1899@@ -1316,7 +1314,6 @@ void saHpiHotSwapTable_set_commit( netsn
1900 */
1901 void saHpiHotSwapTable_set_free( netsnmp_request_group *rg )
1902 {
1903- netsnmp_variable_list *var;
1904 // saHpiHotSwapTable_context *row_ctx = (saHpiHotSwapTable_context *)rg->existing_row;
1905 // saHpiHotSwapTable_context *undo_ctx = (saHpiHotSwapTable_context *)rg->undo_info;
1906 netsnmp_request_group_item *current;
1907@@ -1328,7 +1325,6 @@ void saHpiHotSwapTable_set_free( netsnmp
1908 */
1909 for( current = rg->list; current; current = current->next ) {
1910
1911- var = current->ri->requestvb;
1912
1913 switch(current->tri->colnum) {
1914
1915@@ -1388,7 +1384,6 @@ void saHpiHotSwapTable_set_free( netsnmp
1916 */
1917 void saHpiHotSwapTable_set_undo( netsnmp_request_group *rg )
1918 {
1919- netsnmp_variable_list *var;
1920 // saHpiHotSwapTable_context *row_ctx = (saHpiHotSwapTable_context *)rg->existing_row;
1921 // saHpiHotSwapTable_context *undo_ctx = (saHpiHotSwapTable_context *)rg->undo_info;
1922 netsnmp_request_group_item *current;
1923@@ -1400,7 +1395,6 @@ void saHpiHotSwapTable_set_undo( netsnmp
1924 */
1925 for( current = rg->list; current; current = current->next ) {
1926
1927- var = current->ri->requestvb;
1928
1929 switch(current->tri->colnum) {
1930
1931Index: openhpi-subagent-2.3.4/src/saHpiInventoryTable.c
1932===================================================================
1933--- openhpi-subagent-2.3.4.orig/src/saHpiInventoryTable.c
1934+++ openhpi-subagent-2.3.4/src/saHpiInventoryTable.c
1935@@ -844,7 +844,6 @@ void saHpiInventoryTable_set_reserve1( n
1936 // (saHpiInventoryTable_context *)rg->existing_row;
1937 // saHpiInventoryTable_context *undo_ctx =
1938 // (saHpiInventoryTable_context *)rg->undo_info;
1939- netsnmp_variable_list *var;
1940 netsnmp_request_group_item *current;
1941 int rc;
1942
1943@@ -858,7 +857,6 @@ void saHpiInventoryTable_set_reserve1( n
1944 */
1945 for( current = rg->list; current; current = current->next ) {
1946
1947- var = current->ri->requestvb;
1948 rc = SNMP_ERR_NOERROR;
1949
1950 switch(current->tri->colnum) {
1951@@ -885,7 +883,6 @@ void saHpiInventoryTable_set_reserve2( n
1952 // saHpiInventoryTable_context *row_ctx = (saHpiInventoryTable_context *)rg->existing_row;
1953 // saHpiInventoryTable_context *undo_ctx = (saHpiInventoryTable_context *)rg->undo_info;
1954 netsnmp_request_group_item *current;
1955- netsnmp_variable_list *var;
1956 int rc;
1957
1958 DEBUGMSGTL ((AGENT, "saHpiInventoryTable_set_reserve2, called\n"));
1959@@ -898,7 +895,6 @@ void saHpiInventoryTable_set_reserve2( n
1960 */
1961 for( current = rg->list; current; current = current->next ) {
1962
1963- var = current->ri->requestvb;
1964 rc = SNMP_ERR_NOERROR;
1965
1966 switch(current->tri->colnum) {
1967@@ -930,7 +926,6 @@ void saHpiInventoryTable_set_reserve2( n
1968 */
1969 void saHpiInventoryTable_set_action( netsnmp_request_group *rg )
1970 {
1971- netsnmp_variable_list *var;
1972 // saHpiInventoryTable_context *row_ctx = (saHpiInventoryTable_context *)rg->existing_row;
1973 // saHpiInventoryTable_context *undo_ctx = (saHpiInventoryTable_context *)rg->undo_info;
1974 netsnmp_request_group_item *current;
1975@@ -946,7 +941,6 @@ void saHpiInventoryTable_set_action( net
1976 */
1977 for( current = rg->list; current; current = current->next ) {
1978
1979- var = current->ri->requestvb;
1980
1981 switch(current->tri->colnum) {
1982
1983@@ -983,7 +977,6 @@ void saHpiInventoryTable_set_action( net
1984 */
1985 void saHpiInventoryTable_set_commit( netsnmp_request_group *rg )
1986 {
1987- netsnmp_variable_list *var;
1988 // saHpiInventoryTable_context *row_ctx = (saHpiInventoryTable_context *)rg->existing_row;
1989 // saHpiInventoryTable_context *undo_ctx = (saHpiInventoryTable_context *)rg->undo_info;
1990 netsnmp_request_group_item *current;
1991@@ -995,7 +988,6 @@ void saHpiInventoryTable_set_commit( net
1992 */
1993 for( current = rg->list; current; current = current->next ) {
1994
1995- var = current->ri->requestvb;
1996
1997 switch(current->tri->colnum) {
1998
1999@@ -1020,7 +1012,6 @@ void saHpiInventoryTable_set_commit( net
2000 */
2001 void saHpiInventoryTable_set_free( netsnmp_request_group *rg )
2002 {
2003- netsnmp_variable_list *var;
2004 // saHpiInventoryTable_context *row_ctx = (saHpiInventoryTable_context *)rg->existing_row;
2005 // saHpiInventoryTable_context *undo_ctx = (saHpiInventoryTable_context *)rg->undo_info;
2006 netsnmp_request_group_item *current;
2007@@ -1032,7 +1023,6 @@ void saHpiInventoryTable_set_free( netsn
2008 */
2009 for( current = rg->list; current; current = current->next ) {
2010
2011- var = current->ri->requestvb;
2012
2013 switch(current->tri->colnum) {
2014
2015@@ -1069,7 +1059,6 @@ void saHpiInventoryTable_set_free( netsn
2016 */
2017 void saHpiInventoryTable_set_undo( netsnmp_request_group *rg )
2018 {
2019- netsnmp_variable_list *var;
2020 // saHpiInventoryTable_context *row_ctx = (saHpiInventoryTable_context *)rg->existing_row;
2021 // saHpiInventoryTable_context *undo_ctx = (saHpiInventoryTable_context *)rg->undo_info;
2022 netsnmp_request_group_item *current;
2023@@ -1081,7 +1070,6 @@ void saHpiInventoryTable_set_undo( netsn
2024 */
2025 for( current = rg->list; current; current = current->next ) {
2026
2027- var = current->ri->requestvb;
2028
2029 switch(current->tri->colnum) {
2030
2031Index: openhpi-subagent-2.3.4/src/saHpiOemEventLogTable.c
2032===================================================================
2033--- openhpi-subagent-2.3.4.orig/src/saHpiOemEventLogTable.c
2034+++ openhpi-subagent-2.3.4/src/saHpiOemEventLogTable.c
2035@@ -102,7 +102,6 @@ SaErrorT populate_saHpiOemEventLogTable(
2036 oid * this_child_oid,
2037 size_t *this_child_oid_len)
2038 {
2039- SaErrorT rv = SA_OK;
2040
2041 oid oem_evt_oid[Oem_EVENT_LOG_INDEX_NR];
2042 netsnmp_index oem_evt_idx;
2043@@ -154,7 +153,7 @@ SaErrorT populate_saHpiOemEventLogTable(
2044 /* create full oid on This row for parent RowPointer */
2045 column[0] = 1;
2046 column[1] = COLUMN_SAHPIOemEVENTLOGTIMESTAMP;
2047- memset(this_child_oid, 0, sizeof(this_child_oid));
2048+ memset(this_child_oid, 0, MAX_OID_LEN);
2049 build_full_oid(saHpiOemEventLogTable_oid, saHpiOemEventLogTable_oid_len,
2050 column, column_len,
2051 &oem_evt_idx,
2052@@ -175,7 +174,7 @@ SaErrorT populate_saHpiOemEventLogTable(
2053
2054 if (!oem_evt_ctx) {
2055 snmp_log (LOG_ERR, "Not enough memory for an Oem Event Log row!");
2056- rv = AGENT_ERR_INTERNAL_ERROR;
2057+ return AGENT_ERR_INTERNAL_ERROR;
2058 }
2059
2060
2061@@ -231,7 +230,6 @@ SaErrorT oem_event_log_clear(SaHpiSessio
2062 {
2063 oid oem_evt_oid[Oem_EVENT_LOG_INDEX_NR];
2064 netsnmp_index oem_evt_idx;
2065- netsnmp_index *oem_index;
2066 saHpiOemEventLogTable_context *oem_evt_ctx;
2067
2068 DR_XREF *dr_entry;
2069@@ -262,7 +260,7 @@ SaErrorT oem_event_log_clear(SaHpiSessio
2070 /* assign the indices to the index */
2071 oem_evt_idx.oids = (oid *) & oem_evt_oid;
2072
2073- oem_index = CONTAINER_FIRST(cb.container);
2074+ CONTAINER_FIRST(cb.container);
2075 oem_evt_ctx = CONTAINER_FIND(cb.container, &oem_evt_idx);
2076
2077 if (!oem_evt_ctx) {
2078@@ -865,7 +863,6 @@ void saHpiOemEventLogTable_set_reserve1(
2079 // (saHpiOemEventLogTable_context *)rg->existing_row;
2080 // saHpiOemEventLogTable_context *undo_ctx =
2081 // (saHpiOemEventLogTable_context *)rg->undo_info;
2082- netsnmp_variable_list *var;
2083 netsnmp_request_group_item *current;
2084 int rc;
2085
2086@@ -878,7 +875,6 @@ void saHpiOemEventLogTable_set_reserve1(
2087 */
2088 for( current = rg->list; current; current = current->next ) {
2089
2090- var = current->ri->requestvb;
2091 rc = SNMP_ERR_NOERROR;
2092
2093 switch(current->tri->colnum) {
2094@@ -905,7 +901,6 @@ void saHpiOemEventLogTable_set_reserve2(
2095 // saHpiOemEventLogTable_context *row_ctx = (saHpiOemEventLogTable_context *)rg->existing_row;
2096 // saHpiOemEventLogTable_context *undo_ctx = (saHpiOemEventLogTable_context *)rg->undo_info;
2097 netsnmp_request_group_item *current;
2098- netsnmp_variable_list *var;
2099 int rc;
2100
2101 rg->rg_void = rg->list->ri;
2102@@ -916,7 +911,6 @@ void saHpiOemEventLogTable_set_reserve2(
2103 */
2104 for( current = rg->list; current; current = current->next ) {
2105
2106- var = current->ri->requestvb;
2107 rc = SNMP_ERR_NOERROR;
2108
2109 switch(current->tri->colnum) {
2110@@ -948,7 +942,6 @@ void saHpiOemEventLogTable_set_reserve2(
2111 */
2112 void saHpiOemEventLogTable_set_action( netsnmp_request_group *rg )
2113 {
2114- netsnmp_variable_list *var;
2115 // saHpiOemEventLogTable_context *row_ctx = (saHpiOemEventLogTable_context *)rg->existing_row;
2116 // saHpiOemEventLogTable_context *undo_ctx = (saHpiOemEventLogTable_context *)rg->undo_info;
2117 netsnmp_request_group_item *current;
2118@@ -962,7 +955,6 @@ void saHpiOemEventLogTable_set_action( n
2119 */
2120 for( current = rg->list; current; current = current->next ) {
2121
2122- var = current->ri->requestvb;
2123
2124 switch(current->tri->colnum) {
2125
2126@@ -1002,7 +994,6 @@ void saHpiOemEventLogTable_set_action( n
2127 */
2128 void saHpiOemEventLogTable_set_commit( netsnmp_request_group *rg )
2129 {
2130- netsnmp_variable_list *var;
2131 // saHpiOemEventLogTable_context *row_ctx = (saHpiOemEventLogTable_context *)rg->existing_row;
2132 // saHpiOemEventLogTable_context *undo_ctx = (saHpiOemEventLogTable_context *)rg->undo_info;
2133 netsnmp_request_group_item *current;
2134@@ -1012,7 +1003,6 @@ void saHpiOemEventLogTable_set_commit( n
2135 */
2136 for( current = rg->list; current; current = current->next ) {
2137
2138- var = current->ri->requestvb;
2139
2140 switch(current->tri->colnum) {
2141
2142@@ -1037,7 +1027,6 @@ void saHpiOemEventLogTable_set_commit( n
2143 */
2144 void saHpiOemEventLogTable_set_free( netsnmp_request_group *rg )
2145 {
2146- netsnmp_variable_list *var;
2147 // saHpiOemEventLogTable_context *row_ctx = (saHpiOemEventLogTable_context *)rg->existing_row;
2148 // saHpiOemEventLogTable_context *undo_ctx = (saHpiOemEventLogTable_context *)rg->undo_info;
2149 netsnmp_request_group_item *current;
2150@@ -1047,7 +1036,6 @@ void saHpiOemEventLogTable_set_free( net
2151 */
2152 for( current = rg->list; current; current = current->next ) {
2153
2154- var = current->ri->requestvb;
2155
2156 switch(current->tri->colnum) {
2157
2158@@ -1083,7 +1071,6 @@ void saHpiOemEventLogTable_set_free( net
2159 */
2160 void saHpiOemEventLogTable_set_undo( netsnmp_request_group *rg )
2161 {
2162- netsnmp_variable_list *var;
2163 // saHpiOemEventLogTable_context *row_ctx = (saHpiOemEventLogTable_context *)rg->existing_row;
2164 // saHpiOemEventLogTable_context *undo_ctx = (saHpiOemEventLogTable_context *)rg->undo_info;
2165 netsnmp_request_group_item *current;
2166@@ -1093,7 +1080,6 @@ void saHpiOemEventLogTable_set_undo( net
2167 */
2168 for( current = rg->list; current; current = current->next ) {
2169
2170- var = current->ri->requestvb;
2171
2172 switch(current->tri->colnum) {
2173
2174Index: openhpi-subagent-2.3.4/src/saHpiOemEventTable.c
2175===================================================================
2176--- openhpi-subagent-2.3.4.orig/src/saHpiOemEventTable.c
2177+++ openhpi-subagent-2.3.4/src/saHpiOemEventTable.c
2178@@ -104,7 +104,6 @@ SaErrorT populate_saHpiOemEventTable(SaH
2179 oid * this_child_oid,
2180 size_t *this_child_oid_len)
2181 {
2182- SaErrorT rv = SA_OK;
2183 int new_row = MIB_FALSE;
2184
2185 oid oem_evt_oid[Oem_EVENT_INDEX_NR];
2186@@ -162,7 +161,7 @@ SaErrorT populate_saHpiOemEventTable(SaH
2187 }
2188 if (!oem_evt_ctx) {
2189 snmp_log (LOG_ERR, "Not enough memory for a Oem Event row!");
2190- rv = AGENT_ERR_INTERNAL_ERROR;
2191+ return AGENT_ERR_INTERNAL_ERROR;
2192 }
2193
2194 /** SaHpiEntryId = ASN_UNSIGNED */
2195@@ -200,7 +199,7 @@ SaErrorT populate_saHpiOemEventTable(SaH
2196 /* create full oid on This row for parent RowPointer */
2197 column[0] = 1;
2198 column[1] = COLUMN_SAHPIOemEVENTTIMESTAMP;
2199- memset(this_child_oid, 0, sizeof(this_child_oid));
2200+ memset(this_child_oid, 0, MAX_OID_LEN);
2201 build_full_oid(saHpiOemEventTable_oid, saHpiOemEventTable_oid_len,
2202 column, column_len,
2203 &oem_evt_idx,
2204@@ -219,7 +218,6 @@ SaErrorT async_oem_event_add(SaHpiSessio
2205 oid * this_child_oid,
2206 size_t *this_child_oid_len)
2207 {
2208- SaErrorT rv = SA_OK;
2209 int new_row = MIB_FALSE;
2210
2211 oid oem_evt_oid[Oem_EVENT_INDEX_NR];
2212@@ -286,7 +284,7 @@ SaErrorT async_oem_event_add(SaHpiSessio
2213 }
2214 if (!oem_evt_ctx) {
2215 snmp_log (LOG_ERR, "Not enough memory for a Oem Event row!");
2216- rv = AGENT_ERR_INTERNAL_ERROR;
2217+ return AGENT_ERR_INTERNAL_ERROR;
2218 }
2219
2220 /** SaHpiEntryId = ASN_UNSIGNED */
2221@@ -324,7 +322,7 @@ SaErrorT async_oem_event_add(SaHpiSessio
2222 /* create full oid on This row for parent RowPointer */
2223 column[0] = 1;
2224 column[1] = COLUMN_SAHPIOemEVENTTIMESTAMP;
2225- memset(this_child_oid, 0, sizeof(this_child_oid));
2226+ memset(this_child_oid, 0, MAX_OID_LEN);
2227 build_full_oid(saHpiOemEventTable_oid, saHpiOemEventTable_oid_len,
2228 column, column_len,
2229 &oem_evt_idx,
2230@@ -903,7 +901,6 @@ void saHpiOemEventTable_set_reserve1( ne
2231 // (saHpiOemEventTable_context *)rg->existing_row;
2232 // saHpiOemEventTable_context *undo_ctx =
2233 // (saHpiOemEventTable_context *)rg->undo_info;
2234- netsnmp_variable_list *var;
2235 netsnmp_request_group_item *current;
2236 int rc;
2237
2238@@ -916,7 +913,6 @@ void saHpiOemEventTable_set_reserve1( ne
2239 */
2240 for( current = rg->list; current; current = current->next ) {
2241
2242- var = current->ri->requestvb;
2243 rc = SNMP_ERR_NOERROR;
2244
2245 switch(current->tri->colnum) {
2246@@ -943,7 +939,6 @@ void saHpiOemEventTable_set_reserve2( ne
2247 // saHpiOemEventTable_context *row_ctx = (saHpiOemEventTable_context *)rg->existing_row;
2248 // saHpiOemEventTable_context *undo_ctx = (saHpiOemEventTable_context *)rg->undo_info;
2249 netsnmp_request_group_item *current;
2250- netsnmp_variable_list *var;
2251 int rc;
2252
2253 rg->rg_void = rg->list->ri;
2254@@ -954,7 +949,6 @@ void saHpiOemEventTable_set_reserve2( ne
2255 */
2256 for( current = rg->list; current; current = current->next ) {
2257
2258- var = current->ri->requestvb;
2259 rc = SNMP_ERR_NOERROR;
2260
2261 switch(current->tri->colnum) {
2262@@ -986,7 +980,6 @@ void saHpiOemEventTable_set_reserve2( ne
2263 */
2264 void saHpiOemEventTable_set_action( netsnmp_request_group *rg )
2265 {
2266- netsnmp_variable_list *var;
2267 // saHpiOemEventTable_context *row_ctx = (saHpiOemEventTable_context *)rg->existing_row;
2268 // saHpiOemEventTable_context *undo_ctx = (saHpiOemEventTable_context *)rg->undo_info;
2269 netsnmp_request_group_item *current;
2270@@ -1000,7 +993,6 @@ void saHpiOemEventTable_set_action( nets
2271 */
2272 for( current = rg->list; current; current = current->next ) {
2273
2274- var = current->ri->requestvb;
2275
2276 switch(current->tri->colnum) {
2277
2278@@ -1041,7 +1033,6 @@ void saHpiOemEventTable_set_action( nets
2279 */
2280 void saHpiOemEventTable_set_commit( netsnmp_request_group *rg )
2281 {
2282- netsnmp_variable_list *var;
2283 // saHpiOemEventTable_context *row_ctx = (saHpiOemEventTable_context *)rg->existing_row;
2284 // saHpiOemEventTable_context *undo_ctx = (saHpiOemEventTable_context *)rg->undo_info;
2285 netsnmp_request_group_item *current;
2286@@ -1051,7 +1042,6 @@ void saHpiOemEventTable_set_commit( nets
2287 */
2288 for( current = rg->list; current; current = current->next ) {
2289
2290- var = current->ri->requestvb;
2291
2292 switch(current->tri->colnum) {
2293
2294@@ -1076,7 +1066,6 @@ void saHpiOemEventTable_set_commit( nets
2295 */
2296 void saHpiOemEventTable_set_free( netsnmp_request_group *rg )
2297 {
2298- netsnmp_variable_list *var;
2299 // saHpiOemEventTable_context *row_ctx = (saHpiOemEventTable_context *)rg->existing_row;
2300 // saHpiOemEventTable_context *undo_ctx = (saHpiOemEventTable_context *)rg->undo_info;
2301 netsnmp_request_group_item *current;
2302@@ -1086,7 +1075,6 @@ void saHpiOemEventTable_set_free( netsnm
2303 */
2304 for( current = rg->list; current; current = current->next ) {
2305
2306- var = current->ri->requestvb;
2307
2308 switch(current->tri->colnum) {
2309
2310@@ -1122,7 +1110,6 @@ void saHpiOemEventTable_set_free( netsnm
2311 */
2312 void saHpiOemEventTable_set_undo( netsnmp_request_group *rg )
2313 {
2314- netsnmp_variable_list *var;
2315 // saHpiOemEventTable_context *row_ctx = (saHpiOemEventTable_context *)rg->existing_row;
2316 // saHpiOemEventTable_context *undo_ctx = (saHpiOemEventTable_context *)rg->undo_info;
2317 netsnmp_request_group_item *current;
2318@@ -1132,7 +1119,6 @@ void saHpiOemEventTable_set_undo( netsnm
2319 */
2320 for( current = rg->list; current; current = current->next ) {
2321
2322- var = current->ri->requestvb;
2323
2324 switch(current->tri->colnum) {
2325
2326Index: openhpi-subagent-2.3.4/src/saHpiRdrTable.c
2327===================================================================
2328--- openhpi-subagent-2.3.4.orig/src/saHpiRdrTable.c
2329+++ openhpi-subagent-2.3.4/src/saHpiRdrTable.c
2330@@ -1074,7 +1074,6 @@ void saHpiRdrTable_set_reserve1( netsnmp
2331 // (saHpiRdrTable_context *)rg->existing_row;
2332 // saHpiRdrTable_context *undo_ctx =
2333 // (saHpiRdrTable_context *)rg->undo_info;
2334- netsnmp_variable_list *var;
2335 netsnmp_request_group_item *current;
2336 int rc;
2337
2338@@ -1088,7 +1087,6 @@ void saHpiRdrTable_set_reserve1( netsnmp
2339 */
2340 for( current = rg->list; current; current = current->next ) {
2341
2342- var = current->ri->requestvb;
2343 rc = SNMP_ERR_NOERROR;
2344
2345 switch(current->tri->colnum) {
2346@@ -1115,7 +1113,6 @@ void saHpiRdrTable_set_reserve2( netsnmp
2347 // saHpiRdrTable_context *row_ctx = (saHpiRdrTable_context *)rg->existing_row;
2348 // saHpiRdrTable_context *undo_ctx = (saHpiRdrTable_context *)rg->undo_info;
2349 netsnmp_request_group_item *current;
2350- netsnmp_variable_list *var;
2351 int rc;
2352
2353 DEBUGMSGTL ((AGENT, "saHpiRdrTable_set_reserve2, called\n"));
2354@@ -1128,7 +1125,6 @@ void saHpiRdrTable_set_reserve2( netsnmp
2355 */
2356 for( current = rg->list; current; current = current->next ) {
2357
2358- var = current->ri->requestvb;
2359 rc = SNMP_ERR_NOERROR;
2360
2361 switch(current->tri->colnum) {
2362@@ -1160,7 +1156,6 @@ void saHpiRdrTable_set_reserve2( netsnmp
2363 */
2364 void saHpiRdrTable_set_action( netsnmp_request_group *rg )
2365 {
2366- netsnmp_variable_list *var;
2367 // saHpiRdrTable_context *row_ctx = (saHpiRdrTable_context *)rg->existing_row;
2368 // saHpiRdrTable_context *undo_ctx = (saHpiRdrTable_context *)rg->undo_info;
2369 netsnmp_request_group_item *current;
2370@@ -1176,7 +1171,6 @@ void saHpiRdrTable_set_action( netsnmp_r
2371 */
2372 for( current = rg->list; current; current = current->next ) {
2373
2374- var = current->ri->requestvb;
2375
2376 switch(current->tri->colnum) {
2377
2378@@ -1213,7 +1207,6 @@ void saHpiRdrTable_set_action( netsnmp_r
2379 */
2380 void saHpiRdrTable_set_commit( netsnmp_request_group *rg )
2381 {
2382- netsnmp_variable_list *var;
2383 // saHpiRdrTable_context *row_ctx = (saHpiRdrTable_context *)rg->existing_row;
2384 // saHpiRdrTable_context *undo_ctx = (saHpiRdrTable_context *)rg->undo_info;
2385 netsnmp_request_group_item *current;
2386@@ -1225,7 +1218,6 @@ void saHpiRdrTable_set_commit( netsnmp_r
2387 */
2388 for( current = rg->list; current; current = current->next ) {
2389
2390- var = current->ri->requestvb;
2391
2392 switch(current->tri->colnum) {
2393
2394@@ -1250,7 +1242,6 @@ void saHpiRdrTable_set_commit( netsnmp_r
2395 */
2396 void saHpiRdrTable_set_free( netsnmp_request_group *rg )
2397 {
2398- netsnmp_variable_list *var;
2399 // saHpiRdrTable_context *row_ctx = (saHpiRdrTable_context *)rg->existing_row;
2400 // saHpiRdrTable_context *undo_ctx = (saHpiRdrTable_context *)rg->undo_info;
2401 netsnmp_request_group_item *current;
2402@@ -1262,7 +1253,6 @@ void saHpiRdrTable_set_free( netsnmp_req
2403 */
2404 for( current = rg->list; current; current = current->next ) {
2405
2406- var = current->ri->requestvb;
2407
2408 switch(current->tri->colnum) {
2409
2410@@ -1299,7 +1289,6 @@ void saHpiRdrTable_set_free( netsnmp_req
2411 */
2412 void saHpiRdrTable_set_undo( netsnmp_request_group *rg )
2413 {
2414- netsnmp_variable_list *var;
2415 // saHpiRdrTable_context *row_ctx = (saHpiRdrTable_context *)rg->existing_row;
2416 // saHpiRdrTable_context *undo_ctx = (saHpiRdrTable_context *)rg->undo_info;
2417 netsnmp_request_group_item *current;
2418@@ -1311,7 +1300,6 @@ void saHpiRdrTable_set_undo( netsnmp_req
2419 */
2420 for( current = rg->list; current; current = current->next ) {
2421
2422- var = current->ri->requestvb;
2423
2424 switch(current->tri->colnum) {
2425
2426Index: openhpi-subagent-2.3.4/src/saHpiResourceEventLogTable.c
2427===================================================================
2428--- openhpi-subagent-2.3.4.orig/src/saHpiResourceEventLogTable.c
2429+++ openhpi-subagent-2.3.4/src/saHpiResourceEventLogTable.c
2430@@ -112,7 +112,6 @@ SaErrorT populate_saHpiResourceEventLogT
2431 oid * this_child_oid,
2432 size_t *this_child_oid_len)
2433 {
2434- SaErrorT rv = SA_OK;
2435
2436 oid res_evt_oid[RESOURCE_EVENT_LOG_INDEX_NR];
2437 netsnmp_index res_evt_idx;
2438@@ -160,7 +159,7 @@ SaErrorT populate_saHpiResourceEventLogT
2439 /* create full oid on This row for parent RowPointer */
2440 column[0] = 1;
2441 column[1] = COLUMN_SAHPIRESOURCEEVENTLOGTIMESTAMP;
2442- memset(this_child_oid, 0, sizeof(this_child_oid));
2443+ memset(this_child_oid, 0, sizeof(*this_child_oid));
2444 build_full_oid(saHpiResourceEventLogTable_oid, saHpiResourceEventLogTable_oid_len,
2445 column, column_len,
2446 &res_evt_idx,
2447@@ -180,7 +179,7 @@ SaErrorT populate_saHpiResourceEventLogT
2448 }
2449 if (!res_evt_ctx) {
2450 snmp_log (LOG_ERR, "Not enough memory for a Resource Event Log row!");
2451- rv = AGENT_ERR_INTERNAL_ERROR;
2452+ return AGENT_ERR_INTERNAL_ERROR;
2453 }
2454
2455 /** SaHpiEntryId = ASN_UNSIGNED */
2456@@ -222,7 +221,6 @@ SaErrorT resource_event_log_clear(SaHpiS
2457 {
2458 oid res_evt_oid[RESOURCE_EVENT_LOG_INDEX_NR];
2459 netsnmp_index res_evt_idx;
2460- netsnmp_index *res_index;
2461 saHpiResourceEventLogTable_context *res_evt_ctx;
2462
2463 DR_XREF *dr_entry;
2464@@ -252,7 +250,7 @@ SaErrorT resource_event_log_clear(SaHpiS
2465 /* assign the indices to the index */
2466 res_evt_idx.oids = (oid *) & res_evt_oid;
2467
2468- res_index = CONTAINER_FIRST(cb.container);
2469+ CONTAINER_FIRST(cb.container);
2470 res_evt_ctx = CONTAINER_FIND(cb.container, &res_evt_idx);
2471
2472 if (!res_evt_ctx) {
2473@@ -857,7 +855,6 @@ void saHpiResourceEventLogTable_set_rese
2474 // (saHpiResourceEventLogTable_context *)rg->existing_row;
2475 // saHpiResourceEventLogTable_context *undo_ctx =
2476 // (saHpiResourceEventLogTable_context *)rg->undo_info;
2477- netsnmp_variable_list *var;
2478 netsnmp_request_group_item *current;
2479 int rc;
2480
2481@@ -871,7 +868,6 @@ void saHpiResourceEventLogTable_set_rese
2482 */
2483 for( current = rg->list; current; current = current->next ) {
2484
2485- var = current->ri->requestvb;
2486 rc = SNMP_ERR_NOERROR;
2487
2488 switch(current->tri->colnum) {
2489@@ -898,7 +894,6 @@ void saHpiResourceEventLogTable_set_rese
2490 // saHpiResourceEventLogTable_context *row_ctx = (saHpiResourceEventLogTable_context *)rg->existing_row;
2491 // saHpiResourceEventLogTable_context *undo_ctx = (saHpiResourceEventLogTable_context *)rg->undo_info;
2492 netsnmp_request_group_item *current;
2493- netsnmp_variable_list *var;
2494 int rc;
2495
2496 DEBUGMSGTL ((AGENT, "saHpiResourceEventLogTable_set_reserve2, called\n"));
2497@@ -911,7 +906,6 @@ void saHpiResourceEventLogTable_set_rese
2498 */
2499 for( current = rg->list; current; current = current->next ) {
2500
2501- var = current->ri->requestvb;
2502 rc = SNMP_ERR_NOERROR;
2503
2504 switch(current->tri->colnum) {
2505@@ -943,7 +937,6 @@ void saHpiResourceEventLogTable_set_rese
2506 */
2507 void saHpiResourceEventLogTable_set_action( netsnmp_request_group *rg )
2508 {
2509- netsnmp_variable_list *var;
2510 // saHpiResourceEventLogTable_context *row_ctx = (saHpiResourceEventLogTable_context *)rg->existing_row;
2511 // saHpiResourceEventLogTable_context *undo_ctx = (saHpiResourceEventLogTable_context *)rg->undo_info;
2512 netsnmp_request_group_item *current;
2513@@ -959,7 +952,6 @@ void saHpiResourceEventLogTable_set_acti
2514 */
2515 for( current = rg->list; current; current = current->next ) {
2516
2517- var = current->ri->requestvb;
2518
2519 switch(current->tri->colnum) {
2520
2521@@ -995,7 +987,6 @@ void saHpiResourceEventLogTable_set_acti
2522 */
2523 void saHpiResourceEventLogTable_set_commit( netsnmp_request_group *rg )
2524 {
2525- netsnmp_variable_list *var;
2526 // saHpiResourceEventLogTable_context *row_ctx = (saHpiResourceEventLogTable_context *)rg->existing_row;
2527 // saHpiResourceEventLogTable_context *undo_ctx = (saHpiResourceEventLogTable_context *)rg->undo_info;
2528 netsnmp_request_group_item *current;
2529@@ -1007,7 +998,6 @@ void saHpiResourceEventLogTable_set_comm
2530 */
2531 for( current = rg->list; current; current = current->next ) {
2532
2533- var = current->ri->requestvb;
2534
2535 switch(current->tri->colnum) {
2536
2537@@ -1032,7 +1022,6 @@ void saHpiResourceEventLogTable_set_comm
2538 */
2539 void saHpiResourceEventLogTable_set_free( netsnmp_request_group *rg )
2540 {
2541- netsnmp_variable_list *var;
2542 // saHpiResourceEventLogTable_context *row_ctx = (saHpiResourceEventLogTable_context *)rg->existing_row;
2543 // saHpiResourceEventLogTable_context *undo_ctx = (saHpiResourceEventLogTable_context *)rg->undo_info;
2544 netsnmp_request_group_item *current;
2545@@ -1044,7 +1033,6 @@ void saHpiResourceEventLogTable_set_free
2546 */
2547 for( current = rg->list; current; current = current->next ) {
2548
2549- var = current->ri->requestvb;
2550
2551 switch(current->tri->colnum) {
2552
2553@@ -1081,7 +1069,6 @@ void saHpiResourceEventLogTable_set_free
2554 */
2555 void saHpiResourceEventLogTable_set_undo( netsnmp_request_group *rg )
2556 {
2557- netsnmp_variable_list *var;
2558 // saHpiResourceEventLogTable_context *row_ctx = (saHpiResourceEventLogTable_context *)rg->existing_row;
2559 // saHpiResourceEventLogTable_context *undo_ctx = (saHpiResourceEventLogTable_context *)rg->undo_info;
2560 netsnmp_request_group_item *current;
2561@@ -1093,7 +1080,6 @@ void saHpiResourceEventLogTable_set_undo
2562 */
2563 for( current = rg->list; current; current = current->next ) {
2564
2565- var = current->ri->requestvb;
2566
2567 switch(current->tri->colnum) {
2568
2569Index: openhpi-subagent-2.3.4/src/saHpiResourceEventTable.c
2570===================================================================
2571--- openhpi-subagent-2.3.4.orig/src/saHpiResourceEventTable.c
2572+++ openhpi-subagent-2.3.4/src/saHpiResourceEventTable.c
2573@@ -105,7 +105,6 @@ SaErrorT populate_saHpiResourceEventTabl
2574 oid * this_child_oid,
2575 size_t *this_child_oid_len)
2576 {
2577- SaErrorT rv = SA_OK;
2578 int new_row = MIB_FALSE;
2579
2580 oid res_evt_oid[RESOURCE_EVENT_INDEX_NR];
2581@@ -157,7 +156,7 @@ SaErrorT populate_saHpiResourceEventTabl
2582 /* create full oid on This row for parent RowPointer */
2583 column[0] = 1;
2584 column[1] = COLUMN_SAHPIRESOURCEEVENTTIMESTAMP;
2585- memset(this_child_oid, 0, sizeof(this_child_oid));
2586+ memset(this_child_oid, 0, sizeof(*this_child_oid));
2587 build_full_oid(saHpiResourceEventTable_oid, saHpiResourceEventTable_oid_len,
2588 column, column_len,
2589 &res_evt_idx,
2590@@ -176,7 +175,6 @@ SaErrorT populate_saHpiResourceEventTabl
2591 }
2592 if (!res_evt_ctx) {
2593 snmp_log (LOG_ERR, "Not enough memory for a Resource Event row!");
2594- rv = AGENT_ERR_INTERNAL_ERROR;
2595 }
2596
2597 /** SaHpiEntryId = ASN_UNSIGNED */
2598@@ -206,7 +204,6 @@ SaErrorT async_resource_event_add(SaHpiS
2599 oid * this_child_oid,
2600 size_t *this_child_oid_len)
2601 {
2602- SaErrorT rv = SA_OK;
2603 int new_row = MIB_FALSE;
2604
2605 oid res_evt_oid[RESOURCE_EVENT_INDEX_NR];
2606@@ -255,7 +252,7 @@ SaErrorT async_resource_event_add(SaHpiS
2607 /* create full oid on This row for parent RowPointer */
2608 column[0] = 1;
2609 column[1] = COLUMN_SAHPIRESOURCEEVENTTIMESTAMP;
2610- memset(this_child_oid, 0, sizeof(this_child_oid));
2611+ memset(this_child_oid, 0, sizeof(*this_child_oid));
2612 build_full_oid(saHpiResourceEventTable_oid, saHpiResourceEventTable_oid_len,
2613 column, column_len,
2614 &res_evt_idx,
2615@@ -274,7 +271,6 @@ SaErrorT async_resource_event_add(SaHpiS
2616 }
2617 if (!res_evt_ctx) {
2618 snmp_log (LOG_ERR, "Not enough memory for a Resource Event row!");
2619- rv = AGENT_ERR_INTERNAL_ERROR;
2620 }
2621
2622 /** SaHpiEntryId = ASN_UNSIGNED */
2623@@ -867,7 +863,6 @@ void saHpiResourceEventTable_set_reserve
2624 // (saHpiResourceEventTable_context *)rg->existing_row;
2625 // saHpiResourceEventTable_context *undo_ctx =
2626 // (saHpiResourceEventTable_context *)rg->undo_info;
2627- netsnmp_variable_list *var;
2628 netsnmp_request_group_item *current;
2629 int rc;
2630
2631@@ -881,7 +876,6 @@ void saHpiResourceEventTable_set_reserve
2632 */
2633 for( current = rg->list; current; current = current->next ) {
2634
2635- var = current->ri->requestvb;
2636 rc = SNMP_ERR_NOERROR;
2637
2638 switch(current->tri->colnum) {
2639@@ -908,7 +902,6 @@ void saHpiResourceEventTable_set_reserve
2640 // saHpiResourceEventTable_context *row_ctx = (saHpiResourceEventTable_context *)rg->existing_row;
2641 // saHpiResourceEventTable_context *undo_ctx = (saHpiResourceEventTable_context *)rg->undo_info;
2642 netsnmp_request_group_item *current;
2643- netsnmp_variable_list *var;
2644 int rc;
2645
2646 DEBUGMSGTL ((AGENT, "saHpiResourceEventTable_set_reserve2, called\n"));
2647@@ -921,7 +914,6 @@ void saHpiResourceEventTable_set_reserve
2648 */
2649 for( current = rg->list; current; current = current->next ) {
2650
2651- var = current->ri->requestvb;
2652 rc = SNMP_ERR_NOERROR;
2653
2654 switch(current->tri->colnum) {
2655@@ -953,7 +945,6 @@ void saHpiResourceEventTable_set_reserve
2656 */
2657 void saHpiResourceEventTable_set_action( netsnmp_request_group *rg )
2658 {
2659- netsnmp_variable_list *var;
2660 // saHpiResourceEventTable_context *row_ctx = (saHpiResourceEventTable_context *)rg->existing_row;
2661 // saHpiResourceEventTable_context *undo_ctx = (saHpiResourceEventTable_context *)rg->undo_info;
2662 netsnmp_request_group_item *current;
2663@@ -969,7 +960,6 @@ void saHpiResourceEventTable_set_action(
2664 */
2665 for( current = rg->list; current; current = current->next ) {
2666
2667- var = current->ri->requestvb;
2668
2669 switch(current->tri->colnum) {
2670
2671@@ -1005,7 +995,6 @@ void saHpiResourceEventTable_set_action(
2672 */
2673 void saHpiResourceEventTable_set_commit( netsnmp_request_group *rg )
2674 {
2675- netsnmp_variable_list *var;
2676 // saHpiResourceEventTable_context *row_ctx = (saHpiResourceEventTable_context *)rg->existing_row;
2677 // saHpiResourceEventTable_context *undo_ctx = (saHpiResourceEventTable_context *)rg->undo_info;
2678 netsnmp_request_group_item *current;
2679@@ -1017,7 +1006,6 @@ void saHpiResourceEventTable_set_commit(
2680 */
2681 for( current = rg->list; current; current = current->next ) {
2682
2683- var = current->ri->requestvb;
2684
2685 switch(current->tri->colnum) {
2686
2687@@ -1042,7 +1030,6 @@ void saHpiResourceEventTable_set_commit(
2688 */
2689 void saHpiResourceEventTable_set_free( netsnmp_request_group *rg )
2690 {
2691- netsnmp_variable_list *var;
2692 // saHpiResourceEventTable_context *row_ctx = (saHpiResourceEventTable_context *)rg->existing_row;
2693 // saHpiResourceEventTable_context *undo_ctx = (saHpiResourceEventTable_context *)rg->undo_info;
2694 netsnmp_request_group_item *current;
2695@@ -1054,7 +1041,6 @@ void saHpiResourceEventTable_set_free( n
2696 */
2697 for( current = rg->list; current; current = current->next ) {
2698
2699- var = current->ri->requestvb;
2700
2701 switch(current->tri->colnum) {
2702
2703@@ -1091,7 +1077,6 @@ void saHpiResourceEventTable_set_free( n
2704 */
2705 void saHpiResourceEventTable_set_undo( netsnmp_request_group *rg )
2706 {
2707- netsnmp_variable_list *var;
2708 // saHpiResourceEventTable_context *row_ctx = (saHpiResourceEventTable_context *)rg->existing_row;
2709 // saHpiResourceEventTable_context *undo_ctx = (saHpiResourceEventTable_context *)rg->undo_info;
2710 netsnmp_request_group_item *current;
2711@@ -1103,7 +1088,6 @@ void saHpiResourceEventTable_set_undo( n
2712 */
2713 for( current = rg->list; current; current = current->next ) {
2714
2715- var = current->ri->requestvb;
2716
2717 switch(current->tri->colnum) {
2718
2719Index: openhpi-subagent-2.3.4/src/saHpiResourceTable.c
2720===================================================================
2721--- openhpi-subagent-2.3.4.orig/src/saHpiResourceTable.c
2722+++ openhpi-subagent-2.3.4/src/saHpiResourceTable.c
2723@@ -1647,7 +1647,6 @@ void saHpiResourceTable_set_action( nets
2724 */
2725 void saHpiResourceTable_set_commit( netsnmp_request_group *rg )
2726 {
2727- netsnmp_variable_list *var;
2728 // saHpiResourceTable_context *row_ctx = (saHpiResourceTable_context *)rg->existing_row;
2729 // saHpiResourceTable_context *undo_ctx = (saHpiResourceTable_context *)rg->undo_info;
2730 netsnmp_request_group_item *current;
2731@@ -1659,7 +1658,6 @@ void saHpiResourceTable_set_commit( nets
2732 */
2733 for ( current = rg->list; current; current = current->next ) {
2734
2735- var = current->ri->requestvb;
2736
2737 switch (current->tri->colnum) {
2738
2739@@ -1712,7 +1710,6 @@ void saHpiResourceTable_set_commit( nets
2740 */
2741 void saHpiResourceTable_set_free( netsnmp_request_group *rg )
2742 {
2743- netsnmp_variable_list *var;
2744 // saHpiResourceTable_context *row_ctx = (saHpiResourceTable_context *)rg->existing_row;
2745 // saHpiResourceTable_context *undo_ctx = (saHpiResourceTable_context *)rg->undo_info;
2746 netsnmp_request_group_item *current;
2747@@ -1724,7 +1721,6 @@ void saHpiResourceTable_set_free( netsnm
2748 */
2749 for ( current = rg->list; current; current = current->next ) {
2750
2751- var = current->ri->requestvb;
2752
2753 switch (current->tri->colnum) {
2754
2755@@ -1788,7 +1784,6 @@ void saHpiResourceTable_set_free( netsnm
2756 */
2757 void saHpiResourceTable_set_undo( netsnmp_request_group *rg )
2758 {
2759- netsnmp_variable_list *var;
2760 // saHpiResourceTable_context *row_ctx = (saHpiResourceTable_context *)rg->existing_row;
2761 // saHpiResourceTable_context *undo_ctx = (saHpiResourceTable_context *)rg->undo_info;
2762 netsnmp_request_group_item *current;
2763@@ -1800,7 +1795,6 @@ void saHpiResourceTable_set_undo( netsnm
2764 */
2765 for ( current = rg->list; current; current = current->next ) {
2766
2767- var = current->ri->requestvb;
2768
2769 switch (current->tri->colnum) {
2770
2771Index: openhpi-subagent-2.3.4/src/saHpiSensorEnableChangeEventLogTable.c
2772===================================================================
2773--- openhpi-subagent-2.3.4.orig/src/saHpiSensorEnableChangeEventLogTable.c
2774+++ openhpi-subagent-2.3.4/src/saHpiSensorEnableChangeEventLogTable.c
2775@@ -104,7 +104,6 @@ SaErrorT populate_saHpiSensorEnableChang
2776 oid * this_child_oid,
2777 size_t *this_child_oid_len)
2778 {
2779- SaErrorT rv = SA_OK;
2780
2781 oid sec_evt_oid[SENSOR_ENABLE_CHANGE_EVENT_LOG_INDEX_NR];
2782 netsnmp_index sec_evt_idx;
2783@@ -159,7 +158,7 @@ SaErrorT populate_saHpiSensorEnableChang
2784 /* create full oid on This row for parent RowPointer */
2785 column[0] = 1;
2786 column[1] = COLUMN_SAHPISENSORENABLECHANGEEVENTLOGTIMESTAMP;
2787- memset(this_child_oid, 0, sizeof(this_child_oid));
2788+ memset(this_child_oid, 0, MAX_OID_LEN);
2789 build_full_oid(saHpiSensorEnableChangeEventLogTable_oid, saHpiSensorEnableChangeEventLogTable_oid_len,
2790 column, column_len,
2791 &sec_evt_idx,
2792@@ -180,7 +179,7 @@ SaErrorT populate_saHpiSensorEnableChang
2793
2794 if (!sec_evt_ctx) {
2795 snmp_log (LOG_ERR, "Not enough memory for a Sensor Enable Change Event Log row!");
2796- rv = AGENT_ERR_INTERNAL_ERROR;
2797+ return AGENT_ERR_INTERNAL_ERROR;
2798 }
2799
2800
2801@@ -347,7 +346,6 @@ SaErrorT sen_en_change_event_log_clear(S
2802 {
2803 oid sec_evt_oid[SENSOR_ENABLE_CHANGE_EVENT_LOG_INDEX_NR];
2804 netsnmp_index sec_evt_idx;
2805- netsnmp_index *sec_index;
2806 saHpiSensorEnableChangeEventLogTable_context *sec_evt_ctx;
2807
2808 DR_XREF *dr_entry;
2809@@ -380,7 +378,7 @@ SaErrorT sen_en_change_event_log_clear(S
2810 /* assign the indices to the index */
2811 sec_evt_idx.oids = (oid *) & sec_evt_oid;
2812
2813- sec_index = CONTAINER_FIRST(cb.container);
2814+ CONTAINER_FIRST(cb.container);
2815 sec_evt_ctx = CONTAINER_FIND(cb.container, &sec_evt_idx);
2816
2817 if (!sec_evt_ctx) {
2818@@ -1012,7 +1010,6 @@ void saHpiSensorEnableChangeEventLogTabl
2819 // (saHpiSensorEnableChangeEventLogTable_context *)rg->existing_row;
2820 // saHpiSensorEnableChangeEventLogTable_context *undo_ctx =
2821 // (saHpiSensorEnableChangeEventLogTable_context *)rg->undo_info;
2822- netsnmp_variable_list *var;
2823 netsnmp_request_group_item *current;
2824 int rc;
2825
2826@@ -1025,7 +1022,6 @@ void saHpiSensorEnableChangeEventLogTabl
2827 */
2828 for( current = rg->list; current; current = current->next ) {
2829
2830- var = current->ri->requestvb;
2831 rc = SNMP_ERR_NOERROR;
2832
2833 switch(current->tri->colnum) {
2834@@ -1052,7 +1048,6 @@ void saHpiSensorEnableChangeEventLogTabl
2835 // saHpiSensorEnableChangeEventLogTable_context *row_ctx = (saHpiSensorEnableChangeEventLogTable_context *)rg->existing_row;
2836 // saHpiSensorEnableChangeEventLogTable_context *undo_ctx = (saHpiSensorEnableChangeEventLogTable_context *)rg->undo_info;
2837 netsnmp_request_group_item *current;
2838- netsnmp_variable_list *var;
2839 int rc;
2840
2841 rg->rg_void = rg->list->ri;
2842@@ -1063,7 +1058,6 @@ void saHpiSensorEnableChangeEventLogTabl
2843 */
2844 for( current = rg->list; current; current = current->next ) {
2845
2846- var = current->ri->requestvb;
2847 rc = SNMP_ERR_NOERROR;
2848
2849 switch(current->tri->colnum) {
2850@@ -1095,7 +1089,6 @@ void saHpiSensorEnableChangeEventLogTabl
2851 */
2852 void saHpiSensorEnableChangeEventLogTable_set_action( netsnmp_request_group *rg )
2853 {
2854- netsnmp_variable_list *var;
2855 // saHpiSensorEnableChangeEventLogTable_context *row_ctx = (saHpiSensorEnableChangeEventLogTable_context *)rg->existing_row;
2856 // saHpiSensorEnableChangeEventLogTable_context *undo_ctx = (saHpiSensorEnableChangeEventLogTable_context *)rg->undo_info;
2857 netsnmp_request_group_item *current;
2858@@ -1109,7 +1102,6 @@ void saHpiSensorEnableChangeEventLogTabl
2859 */
2860 for( current = rg->list; current; current = current->next ) {
2861
2862- var = current->ri->requestvb;
2863
2864 switch(current->tri->colnum) {
2865
2866@@ -1150,7 +1142,6 @@ void saHpiSensorEnableChangeEventLogTabl
2867 */
2868 void saHpiSensorEnableChangeEventLogTable_set_commit( netsnmp_request_group *rg )
2869 {
2870- netsnmp_variable_list *var;
2871 // saHpiSensorEnableChangeEventLogTable_context *row_ctx = (saHpiSensorEnableChangeEventLogTable_context *)rg->existing_row;
2872 // saHpiSensorEnableChangeEventLogTable_context *undo_ctx = (saHpiSensorEnableChangeEventLogTable_context *)rg->undo_info;
2873 netsnmp_request_group_item *current;
2874@@ -1160,7 +1151,6 @@ void saHpiSensorEnableChangeEventLogTabl
2875 */
2876 for( current = rg->list; current; current = current->next ) {
2877
2878- var = current->ri->requestvb;
2879
2880 switch(current->tri->colnum) {
2881
2882@@ -1185,7 +1175,6 @@ void saHpiSensorEnableChangeEventLogTabl
2883 */
2884 void saHpiSensorEnableChangeEventLogTable_set_free( netsnmp_request_group *rg )
2885 {
2886- netsnmp_variable_list *var;
2887 // saHpiSensorEnableChangeEventLogTable_context *row_ctx = (saHpiSensorEnableChangeEventLogTable_context *)rg->existing_row;
2888 // saHpiSensorEnableChangeEventLogTable_context *undo_ctx = (saHpiSensorEnableChangeEventLogTable_context *)rg->undo_info;
2889 netsnmp_request_group_item *current;
2890@@ -1195,7 +1184,6 @@ void saHpiSensorEnableChangeEventLogTabl
2891 */
2892 for( current = rg->list; current; current = current->next ) {
2893
2894- var = current->ri->requestvb;
2895
2896 switch(current->tri->colnum) {
2897
2898@@ -1231,7 +1219,6 @@ void saHpiSensorEnableChangeEventLogTabl
2899 */
2900 void saHpiSensorEnableChangeEventLogTable_set_undo( netsnmp_request_group *rg )
2901 {
2902- netsnmp_variable_list *var;
2903 // saHpiSensorEnableChangeEventLogTable_context *row_ctx = (saHpiSensorEnableChangeEventLogTable_context *)rg->existing_row;
2904 // saHpiSensorEnableChangeEventLogTable_context *undo_ctx = (saHpiSensorEnableChangeEventLogTable_context *)rg->undo_info;
2905 netsnmp_request_group_item *current;
2906@@ -1241,7 +1228,6 @@ void saHpiSensorEnableChangeEventLogTabl
2907 */
2908 for( current = rg->list; current; current = current->next ) {
2909
2910- var = current->ri->requestvb;
2911
2912 switch(current->tri->colnum) {
2913
2914Index: openhpi-subagent-2.3.4/src/saHpiSensorEnableChangeEventTable.c
2915===================================================================
2916--- openhpi-subagent-2.3.4.orig/src/saHpiSensorEnableChangeEventTable.c
2917+++ openhpi-subagent-2.3.4/src/saHpiSensorEnableChangeEventTable.c
2918@@ -104,7 +104,6 @@ SaErrorT populate_saHpiSensorEnableChang
2919 oid * this_child_oid,
2920 size_t *this_child_oid_len)
2921 {
2922- SaErrorT rv = SA_OK;
2923 int new_row = MIB_FALSE;
2924
2925 oid sensor_enable_change_evt_oid[SENSOR_ENABLE_CHANGE_EVENT_INDEX_NR];
2926@@ -167,7 +166,7 @@ SaErrorT populate_saHpiSensorEnableChang
2927 }
2928 if (!sensor_enable_change_evt_ctx) {
2929 snmp_log (LOG_ERR, "Not enough memory for a Sensor Enable Change Event row!");
2930- rv = AGENT_ERR_INTERNAL_ERROR;
2931+ return AGENT_ERR_INTERNAL_ERROR;
2932 }
2933
2934 /** SaHpiEntryId = ASN_UNSIGNED */
2935@@ -335,7 +334,6 @@ SaErrorT async_sensor_enable_change_even
2936 oid * this_child_oid,
2937 size_t *this_child_oid_len)
2938 {
2939- SaErrorT rv = SA_OK;
2940 int new_row = MIB_FALSE;
2941
2942 oid sensor_enable_change_evt_oid[SENSOR_ENABLE_CHANGE_EVENT_INDEX_NR];
2943@@ -406,7 +404,7 @@ SaErrorT async_sensor_enable_change_even
2944 }
2945 if (!sensor_enable_change_evt_ctx) {
2946 snmp_log (LOG_ERR, "Not enough memory for a Sensor Enable Change Event row!");
2947- rv = AGENT_ERR_INTERNAL_ERROR;
2948+ return AGENT_ERR_INTERNAL_ERROR;
2949 }
2950
2951 /** SaHpiEntryId = ASN_UNSIGNED */
2952@@ -1152,7 +1150,6 @@ void saHpiSensorEnableChangeEventTable_s
2953 // (saHpiSensorEnableChangeEventTable_context *)rg->existing_row;
2954 // saHpiSensorEnableChangeEventTable_context *undo_ctx =
2955 // (saHpiSensorEnableChangeEventTable_context *)rg->undo_info;
2956- netsnmp_variable_list *var;
2957 netsnmp_request_group_item *current;
2958 int rc;
2959
2960@@ -1165,7 +1162,6 @@ void saHpiSensorEnableChangeEventTable_s
2961 */
2962 for( current = rg->list; current; current = current->next ) {
2963
2964- var = current->ri->requestvb;
2965 rc = SNMP_ERR_NOERROR;
2966
2967 switch(current->tri->colnum) {
2968@@ -1192,7 +1188,6 @@ void saHpiSensorEnableChangeEventTable_s
2969 // saHpiSensorEnableChangeEventTable_context *row_ctx = (saHpiSensorEnableChangeEventTable_context *)rg->existing_row;
2970 // saHpiSensorEnableChangeEventTable_context *undo_ctx = (saHpiSensorEnableChangeEventTable_context *)rg->undo_info;
2971 netsnmp_request_group_item *current;
2972- netsnmp_variable_list *var;
2973 int rc;
2974
2975 rg->rg_void = rg->list->ri;
2976@@ -1203,7 +1198,6 @@ void saHpiSensorEnableChangeEventTable_s
2977 */
2978 for( current = rg->list; current; current = current->next ) {
2979
2980- var = current->ri->requestvb;
2981 rc = SNMP_ERR_NOERROR;
2982
2983 switch(current->tri->colnum) {
2984@@ -1235,7 +1229,6 @@ void saHpiSensorEnableChangeEventTable_s
2985 */
2986 void saHpiSensorEnableChangeEventTable_set_action( netsnmp_request_group *rg )
2987 {
2988- netsnmp_variable_list *var;
2989 // saHpiSensorEnableChangeEventTable_context *row_ctx = (saHpiSensorEnableChangeEventTable_context *)rg->existing_row;
2990 // saHpiSensorEnableChangeEventTable_context *undo_ctx = (saHpiSensorEnableChangeEventTable_context *)rg->undo_info;
2991 netsnmp_request_group_item *current;
2992@@ -1249,7 +1242,6 @@ void saHpiSensorEnableChangeEventTable_s
2993 */
2994 for( current = rg->list; current; current = current->next ) {
2995
2996- var = current->ri->requestvb;
2997
2998 switch(current->tri->colnum) {
2999
3000@@ -1291,7 +1283,6 @@ void saHpiSensorEnableChangeEventTable_s
3001 */
3002 void saHpiSensorEnableChangeEventTable_set_commit( netsnmp_request_group *rg )
3003 {
3004- netsnmp_variable_list *var;
3005 // saHpiSensorEnableChangeEventTable_context *row_ctx = (saHpiSensorEnableChangeEventTable_context *)rg->existing_row;
3006 // saHpiSensorEnableChangeEventTable_context *undo_ctx = (saHpiSensorEnableChangeEventTable_context *)rg->undo_info;
3007 netsnmp_request_group_item *current;
3008@@ -1301,7 +1292,6 @@ void saHpiSensorEnableChangeEventTable_s
3009 */
3010 for( current = rg->list; current; current = current->next ) {
3011
3012- var = current->ri->requestvb;
3013
3014 switch(current->tri->colnum) {
3015
3016@@ -1326,7 +1316,6 @@ void saHpiSensorEnableChangeEventTable_s
3017 */
3018 void saHpiSensorEnableChangeEventTable_set_free( netsnmp_request_group *rg )
3019 {
3020- netsnmp_variable_list *var;
3021 // saHpiSensorEnableChangeEventTable_context *row_ctx = (saHpiSensorEnableChangeEventTable_context *)rg->existing_row;
3022 // saHpiSensorEnableChangeEventTable_context *undo_ctx = (saHpiSensorEnableChangeEventTable_context *)rg->undo_info;
3023 netsnmp_request_group_item *current;
3024@@ -1336,7 +1325,6 @@ void saHpiSensorEnableChangeEventTable_s
3025 */
3026 for( current = rg->list; current; current = current->next ) {
3027
3028- var = current->ri->requestvb;
3029
3030 switch(current->tri->colnum) {
3031
3032@@ -1372,7 +1360,6 @@ void saHpiSensorEnableChangeEventTable_s
3033 */
3034 void saHpiSensorEnableChangeEventTable_set_undo( netsnmp_request_group *rg )
3035 {
3036- netsnmp_variable_list *var;
3037 // saHpiSensorEnableChangeEventTable_context *row_ctx = (saHpiSensorEnableChangeEventTable_context *)rg->existing_row;
3038 // saHpiSensorEnableChangeEventTable_context *undo_ctx = (saHpiSensorEnableChangeEventTable_context *)rg->undo_info;
3039 netsnmp_request_group_item *current;
3040@@ -1382,7 +1369,6 @@ void saHpiSensorEnableChangeEventTable_s
3041 */
3042 for( current = rg->list; current; current = current->next ) {
3043
3044- var = current->ri->requestvb;
3045
3046 switch(current->tri->colnum) {
3047
3048Index: openhpi-subagent-2.3.4/src/saHpiSensorEventLogTable.c
3049===================================================================
3050--- openhpi-subagent-2.3.4.orig/src/saHpiSensorEventLogTable.c
3051+++ openhpi-subagent-2.3.4/src/saHpiSensorEventLogTable.c
3052@@ -336,7 +336,6 @@ SaErrorT sensor_event_log_clear(SaHpiSes
3053
3054 oid sen_evt_oid[SENSOR_EVENT_LOG_INDEX_NR];
3055 netsnmp_index sen_evt_idx;
3056- netsnmp_index *sensor_index;
3057 saHpiSensorEventLogTable_context *sen_evt_ctx;
3058
3059 DR_XREF *dr_entry;
3060@@ -369,7 +368,7 @@ SaErrorT sensor_event_log_clear(SaHpiSes
3061 /* assign the indices to the index */
3062 sen_evt_idx.oids = (oid *) & sen_evt_oid;
3063
3064- sensor_index = CONTAINER_FIRST(cb.container);
3065+ CONTAINER_FIRST(cb.container);
3066 sen_evt_ctx = CONTAINER_FIND(cb.container, &sen_evt_idx);
3067
3068 if (!sen_evt_ctx) {
3069@@ -1000,7 +999,6 @@ void saHpiSensorEventLogTable_set_reserv
3070 // (saHpiSensorEventLogTable_context *)rg->existing_row;
3071 // saHpiSensorEventLogTable_context *undo_ctx =
3072 // (saHpiSensorEventLogTable_context *)rg->undo_info;
3073- netsnmp_variable_list *var;
3074 netsnmp_request_group_item *current;
3075 int rc;
3076
3077@@ -1013,7 +1011,6 @@ void saHpiSensorEventLogTable_set_reserv
3078 */
3079 for( current = rg->list; current; current = current->next ) {
3080
3081- var = current->ri->requestvb;
3082 rc = SNMP_ERR_NOERROR;
3083
3084 switch(current->tri->colnum) {
3085@@ -1040,7 +1037,6 @@ void saHpiSensorEventLogTable_set_reserv
3086 // saHpiSensorEventLogTable_context *row_ctx = (saHpiSensorEventLogTable_context *)rg->existing_row;
3087 // saHpiSensorEventLogTable_context *undo_ctx = (saHpiSensorEventLogTable_context *)rg->undo_info;
3088 netsnmp_request_group_item *current;
3089- netsnmp_variable_list *var;
3090 int rc;
3091
3092 rg->rg_void = rg->list->ri;
3093@@ -1051,7 +1047,6 @@ void saHpiSensorEventLogTable_set_reserv
3094 */
3095 for( current = rg->list; current; current = current->next ) {
3096
3097- var = current->ri->requestvb;
3098 rc = SNMP_ERR_NOERROR;
3099
3100 switch(current->tri->colnum) {
3101@@ -1083,7 +1078,6 @@ void saHpiSensorEventLogTable_set_reserv
3102 */
3103 void saHpiSensorEventLogTable_set_action( netsnmp_request_group *rg )
3104 {
3105- netsnmp_variable_list *var;
3106 // saHpiSensorEventLogTable_context *row_ctx = (saHpiSensorEventLogTable_context *)rg->existing_row;
3107 // saHpiSensorEventLogTable_context *undo_ctx = (saHpiSensorEventLogTable_context *)rg->undo_info;
3108 netsnmp_request_group_item *current;
3109@@ -1097,7 +1091,6 @@ void saHpiSensorEventLogTable_set_action
3110 */
3111 for( current = rg->list; current; current = current->next ) {
3112
3113- var = current->ri->requestvb;
3114
3115 switch(current->tri->colnum) {
3116
3117@@ -1133,7 +1126,6 @@ void saHpiSensorEventLogTable_set_action
3118 */
3119 void saHpiSensorEventLogTable_set_commit( netsnmp_request_group *rg )
3120 {
3121- netsnmp_variable_list *var;
3122 // saHpiSensorEventLogTable_context *row_ctx = (saHpiSensorEventLogTable_context *)rg->existing_row;
3123 // saHpiSensorEventLogTable_context *undo_ctx = (saHpiSensorEventLogTable_context *)rg->undo_info;
3124 netsnmp_request_group_item *current;
3125@@ -1143,7 +1135,6 @@ void saHpiSensorEventLogTable_set_commit
3126 */
3127 for( current = rg->list; current; current = current->next ) {
3128
3129- var = current->ri->requestvb;
3130
3131 switch(current->tri->colnum) {
3132
3133@@ -1168,7 +1159,6 @@ void saHpiSensorEventLogTable_set_commit
3134 */
3135 void saHpiSensorEventLogTable_set_free( netsnmp_request_group *rg )
3136 {
3137- netsnmp_variable_list *var;
3138 // saHpiSensorEventLogTable_context *row_ctx = (saHpiSensorEventLogTable_context *)rg->existing_row;
3139 // saHpiSensorEventLogTable_context *undo_ctx = (saHpiSensorEventLogTable_context *)rg->undo_info;
3140 netsnmp_request_group_item *current;
3141@@ -1178,7 +1168,6 @@ void saHpiSensorEventLogTable_set_free(
3142 */
3143 for( current = rg->list; current; current = current->next ) {
3144
3145- var = current->ri->requestvb;
3146
3147 switch(current->tri->colnum) {
3148
3149@@ -1215,7 +1204,6 @@ void saHpiSensorEventLogTable_set_free(
3150 */
3151 void saHpiSensorEventLogTable_set_undo( netsnmp_request_group *rg )
3152 {
3153- netsnmp_variable_list *var;
3154 // saHpiSensorEventLogTable_context *row_ctx = (saHpiSensorEventLogTable_context *)rg->existing_row;
3155 // saHpiSensorEventLogTable_context *undo_ctx = (saHpiSensorEventLogTable_context *)rg->undo_info;
3156 netsnmp_request_group_item *current;
3157@@ -1225,7 +1213,6 @@ void saHpiSensorEventLogTable_set_undo(
3158 */
3159 for( current = rg->list; current; current = current->next ) {
3160
3161- var = current->ri->requestvb;
3162
3163 switch(current->tri->colnum) {
3164
3165Index: openhpi-subagent-2.3.4/src/saHpiSensorEventTable.c
3166===================================================================
3167--- openhpi-subagent-2.3.4.orig/src/saHpiSensorEventTable.c
3168+++ openhpi-subagent-2.3.4/src/saHpiSensorEventTable.c
3169@@ -104,7 +104,6 @@ SaErrorT populate_saHpiSensorEventTable(
3170 oid * this_child_oid,
3171 size_t *this_child_oid_len)
3172 {
3173- SaErrorT rv = SA_OK;
3174 int new_row = MIB_FALSE;
3175
3176 oid sensor_evt_oid[SENSOR_EVENT_INDEX_NR];
3177@@ -167,7 +166,7 @@ SaErrorT populate_saHpiSensorEventTable(
3178 }
3179 if (!sensor_evt_ctx) {
3180 snmp_log (LOG_ERR, "Not enough memory for a Sensor Event row!");
3181- rv = AGENT_ERR_INTERNAL_ERROR;
3182+ return AGENT_ERR_INTERNAL_ERROR;
3183 }
3184
3185 /** SaHpiEntryId = ASN_UNSIGNED */
3186@@ -365,7 +364,6 @@ SaErrorT async_sensor_event_add(SaHpiSes
3187 oid * this_child_oid,
3188 size_t *this_child_oid_len)
3189 {
3190- SaErrorT rv = SA_OK;
3191 int new_row = MIB_FALSE;
3192
3193 oid sensor_evt_oid[SENSOR_EVENT_INDEX_NR];
3194@@ -424,7 +422,7 @@ SaErrorT async_sensor_event_add(SaHpiSes
3195 }
3196 if (!sensor_evt_ctx) {
3197 snmp_log (LOG_ERR, "Not enough memory for a Sensor Event row!");
3198- rv = AGENT_ERR_INTERNAL_ERROR;
3199+ return AGENT_ERR_INTERNAL_ERROR;
3200 }
3201
3202 /** SaHpiEntryId = ASN_UNSIGNED */
3203@@ -1196,7 +1194,6 @@ void saHpiSensorEventTable_set_reserve1(
3204 // (saHpiSensorEventTable_context *)rg->existing_row;
3205 // saHpiSensorEventTable_context *undo_ctx =
3206 // (saHpiSensorEventTable_context *)rg->undo_info;
3207- netsnmp_variable_list *var;
3208 netsnmp_request_group_item *current;
3209 int rc;
3210
3211@@ -1209,7 +1206,6 @@ void saHpiSensorEventTable_set_reserve1(
3212 */
3213 for( current = rg->list; current; current = current->next ) {
3214
3215- var = current->ri->requestvb;
3216 rc = SNMP_ERR_NOERROR;
3217
3218 switch(current->tri->colnum) {
3219@@ -1236,7 +1232,6 @@ void saHpiSensorEventTable_set_reserve2(
3220 // saHpiSensorEventTable_context *row_ctx = (saHpiSensorEventTable_context *)rg->existing_row;
3221 // saHpiSensorEventTable_context *undo_ctx = (saHpiSensorEventTable_context *)rg->undo_info;
3222 netsnmp_request_group_item *current;
3223- netsnmp_variable_list *var;
3224 int rc;
3225
3226 rg->rg_void = rg->list->ri;
3227@@ -1247,7 +1242,6 @@ void saHpiSensorEventTable_set_reserve2(
3228 */
3229 for( current = rg->list; current; current = current->next ) {
3230
3231- var = current->ri->requestvb;
3232 rc = SNMP_ERR_NOERROR;
3233
3234 switch(current->tri->colnum) {
3235@@ -1279,7 +1273,6 @@ void saHpiSensorEventTable_set_reserve2(
3236 */
3237 void saHpiSensorEventTable_set_action( netsnmp_request_group *rg )
3238 {
3239- netsnmp_variable_list *var;
3240 // saHpiSensorEventTable_context *row_ctx = (saHpiSensorEventTable_context *)rg->existing_row;
3241 // saHpiSensorEventTable_context *undo_ctx = (saHpiSensorEventTable_context *)rg->undo_info;
3242 netsnmp_request_group_item *current;
3243@@ -1293,7 +1286,6 @@ void saHpiSensorEventTable_set_action( n
3244 */
3245 for( current = rg->list; current; current = current->next ) {
3246
3247- var = current->ri->requestvb;
3248
3249 switch(current->tri->colnum) {
3250
3251@@ -1335,7 +1327,6 @@ void saHpiSensorEventTable_set_action( n
3252 */
3253 void saHpiSensorEventTable_set_commit( netsnmp_request_group *rg )
3254 {
3255- netsnmp_variable_list *var;
3256 // saHpiSensorEventTable_context *row_ctx = (saHpiSensorEventTable_context *)rg->existing_row;
3257 // saHpiSensorEventTable_context *undo_ctx = (saHpiSensorEventTable_context *)rg->undo_info;
3258 netsnmp_request_group_item *current;
3259@@ -1345,7 +1336,6 @@ void saHpiSensorEventTable_set_commit( n
3260 */
3261 for( current = rg->list; current; current = current->next ) {
3262
3263- var = current->ri->requestvb;
3264
3265 switch(current->tri->colnum) {
3266
3267@@ -1370,7 +1360,6 @@ void saHpiSensorEventTable_set_commit( n
3268 */
3269 void saHpiSensorEventTable_set_free( netsnmp_request_group *rg )
3270 {
3271- netsnmp_variable_list *var;
3272 // saHpiSensorEventTable_context *row_ctx = (saHpiSensorEventTable_context *)rg->existing_row;
3273 // saHpiSensorEventTable_context *undo_ctx = (saHpiSensorEventTable_context *)rg->undo_info;
3274 netsnmp_request_group_item *current;
3275@@ -1380,7 +1369,6 @@ void saHpiSensorEventTable_set_free( net
3276 */
3277 for( current = rg->list; current; current = current->next ) {
3278
3279- var = current->ri->requestvb;
3280
3281 switch(current->tri->colnum) {
3282
3283@@ -1416,7 +1404,6 @@ void saHpiSensorEventTable_set_free( net
3284 */
3285 void saHpiSensorEventTable_set_undo( netsnmp_request_group *rg )
3286 {
3287- netsnmp_variable_list *var;
3288 // saHpiSensorEventTable_context *row_ctx = (saHpiSensorEventTable_context *)rg->existing_row;
3289 // saHpiSensorEventTable_context *undo_ctx = (saHpiSensorEventTable_context *)rg->undo_info;
3290 netsnmp_request_group_item *current;
3291@@ -1426,7 +1413,6 @@ void saHpiSensorEventTable_set_undo( net
3292 */
3293 for( current = rg->list; current; current = current->next ) {
3294
3295- var = current->ri->requestvb;
3296
3297 switch(current->tri->colnum) {
3298
3299Index: openhpi-subagent-2.3.4/src/saHpiSensorReadingMaxTable.c
3300===================================================================
3301--- openhpi-subagent-2.3.4.orig/src/saHpiSensorReadingMaxTable.c
3302+++ openhpi-subagent-2.3.4/src/saHpiSensorReadingMaxTable.c
3303@@ -644,7 +644,6 @@ void saHpiSensorReadingMaxTable_set_rese
3304 // (saHpiSensorReadingMaxTable_context *)rg->existing_row;
3305 // saHpiSensorReadingMaxTable_context *undo_ctx =
3306 // (saHpiSensorReadingMaxTable_context *)rg->undo_info;
3307- netsnmp_variable_list *var;
3308 netsnmp_request_group_item *current;
3309 int rc;
3310
3311@@ -658,7 +657,6 @@ void saHpiSensorReadingMaxTable_set_rese
3312 */
3313 for ( current = rg->list; current; current = current->next ) {
3314
3315- var = current->ri->requestvb;
3316 rc = SNMP_ERR_NOERROR;
3317
3318 switch (current->tri->colnum) {
3319@@ -685,7 +683,6 @@ void saHpiSensorReadingMaxTable_set_rese
3320 // saHpiSensorReadingMaxTable_context *row_ctx = (saHpiSensorReadingMaxTable_context *)rg->existing_row;
3321 // saHpiSensorReadingMaxTable_context *undo_ctx = (saHpiSensorReadingMaxTable_context *)rg->undo_info;
3322 netsnmp_request_group_item *current;
3323- netsnmp_variable_list *var;
3324 int rc;
3325
3326 DEBUGMSGTL ((AGENT, "saHpiSensorReadingMaxTable_set_reserve2, called\n"));
3327@@ -698,7 +695,6 @@ void saHpiSensorReadingMaxTable_set_rese
3328 */
3329 for ( current = rg->list; current; current = current->next ) {
3330
3331- var = current->ri->requestvb;
3332 rc = SNMP_ERR_NOERROR;
3333
3334 switch (current->tri->colnum) {
3335@@ -730,7 +726,6 @@ void saHpiSensorReadingMaxTable_set_rese
3336 */
3337 void saHpiSensorReadingMaxTable_set_action( netsnmp_request_group *rg )
3338 {
3339- netsnmp_variable_list *var;
3340 // saHpiSensorReadingMaxTable_context *row_ctx = (saHpiSensorReadingMaxTable_context *)rg->existing_row;
3341 // saHpiSensorReadingMaxTable_context *undo_ctx = (saHpiSensorReadingMaxTable_context *)rg->undo_info;
3342 netsnmp_request_group_item *current;
3343@@ -746,7 +741,6 @@ void saHpiSensorReadingMaxTable_set_acti
3344 */
3345 for ( current = rg->list; current; current = current->next ) {
3346
3347- var = current->ri->requestvb;
3348
3349 switch (current->tri->colnum) {
3350
3351@@ -782,7 +776,6 @@ void saHpiSensorReadingMaxTable_set_acti
3352 */
3353 void saHpiSensorReadingMaxTable_set_commit( netsnmp_request_group *rg )
3354 {
3355- netsnmp_variable_list *var;
3356 // saHpiSensorReadingMaxTable_context *row_ctx = (saHpiSensorReadingMaxTable_context *)rg->existing_row;
3357 // saHpiSensorReadingMaxTable_context *undo_ctx = (saHpiSensorReadingMaxTable_context *)rg->undo_info;
3358 netsnmp_request_group_item *current;
3359@@ -794,7 +787,6 @@ void saHpiSensorReadingMaxTable_set_comm
3360 */
3361 for ( current = rg->list; current; current = current->next ) {
3362
3363- var = current->ri->requestvb;
3364
3365 switch (current->tri->colnum) {
3366
3367@@ -819,7 +811,6 @@ void saHpiSensorReadingMaxTable_set_comm
3368 */
3369 void saHpiSensorReadingMaxTable_set_free( netsnmp_request_group *rg )
3370 {
3371- netsnmp_variable_list *var;
3372 // saHpiSensorReadingMaxTable_context *row_ctx = (saHpiSensorReadingMaxTable_context *)rg->existing_row;
3373 // saHpiSensorReadingMaxTable_context *undo_ctx = (saHpiSensorReadingMaxTable_context *)rg->undo_info;
3374 netsnmp_request_group_item *current;
3375@@ -831,7 +822,6 @@ void saHpiSensorReadingMaxTable_set_free
3376 */
3377 for ( current = rg->list; current; current = current->next ) {
3378
3379- var = current->ri->requestvb;
3380
3381 switch (current->tri->colnum) {
3382
3383@@ -868,7 +858,6 @@ void saHpiSensorReadingMaxTable_set_free
3384 */
3385 void saHpiSensorReadingMaxTable_set_undo( netsnmp_request_group *rg )
3386 {
3387- netsnmp_variable_list *var;
3388 // saHpiSensorReadingMaxTable_context *row_ctx = (saHpiSensorReadingMaxTable_context *)rg->existing_row;
3389 // saHpiSensorReadingMaxTable_context *undo_ctx = (saHpiSensorReadingMaxTable_context *)rg->undo_info;
3390 netsnmp_request_group_item *current;
3391@@ -880,7 +869,6 @@ void saHpiSensorReadingMaxTable_set_undo
3392 */
3393 for ( current = rg->list; current; current = current->next ) {
3394
3395- var = current->ri->requestvb;
3396
3397 switch (current->tri->colnum) {
3398
3399Index: openhpi-subagent-2.3.4/src/saHpiSensorReadingMinTable.c
3400===================================================================
3401--- openhpi-subagent-2.3.4.orig/src/saHpiSensorReadingMinTable.c
3402+++ openhpi-subagent-2.3.4/src/saHpiSensorReadingMinTable.c
3403@@ -643,7 +643,6 @@ void saHpiSensorReadingMinTable_set_rese
3404 // (saHpiSensorReadingMinTable_context *)rg->existing_row;
3405 // saHpiSensorReadingMinTable_context *undo_ctx =
3406 // (saHpiSensorReadingMinTable_context *)rg->undo_info;
3407- netsnmp_variable_list *var;
3408 netsnmp_request_group_item *current;
3409 int rc;
3410
3411@@ -657,7 +656,6 @@ void saHpiSensorReadingMinTable_set_rese
3412 */
3413 for ( current = rg->list; current; current = current->next ) {
3414
3415- var = current->ri->requestvb;
3416 rc = SNMP_ERR_NOERROR;
3417
3418 switch (current->tri->colnum) {
3419@@ -684,7 +682,6 @@ void saHpiSensorReadingMinTable_set_rese
3420 // saHpiSensorReadingMinTable_context *row_ctx = (saHpiSensorReadingMinTable_context *)rg->existing_row;
3421 // saHpiSensorReadingMinTable_context *undo_ctx = (saHpiSensorReadingMinTable_context *)rg->undo_info;
3422 netsnmp_request_group_item *current;
3423- netsnmp_variable_list *var;
3424 int rc;
3425
3426 DEBUGMSGTL ((AGENT, "saHpiSensorReadingMinTable_set_reserve2, called\n"));
3427@@ -697,7 +694,6 @@ void saHpiSensorReadingMinTable_set_rese
3428 */
3429 for ( current = rg->list; current; current = current->next ) {
3430
3431- var = current->ri->requestvb;
3432 rc = SNMP_ERR_NOERROR;
3433
3434 switch (current->tri->colnum) {
3435@@ -729,7 +725,6 @@ void saHpiSensorReadingMinTable_set_rese
3436 */
3437 void saHpiSensorReadingMinTable_set_action( netsnmp_request_group *rg )
3438 {
3439- netsnmp_variable_list *var;
3440 // saHpiSensorReadingMinTable_context *row_ctx = (saHpiSensorReadingMinTable_context *)rg->existing_row;
3441 // saHpiSensorReadingMinTable_context *undo_ctx = (saHpiSensorReadingMinTable_context *)rg->undo_info;
3442 netsnmp_request_group_item *current;
3443@@ -745,7 +740,6 @@ void saHpiSensorReadingMinTable_set_acti
3444 */
3445 for ( current = rg->list; current; current = current->next ) {
3446
3447- var = current->ri->requestvb;
3448
3449 switch (current->tri->colnum) {
3450
3451@@ -782,7 +776,6 @@ void saHpiSensorReadingMinTable_set_acti
3452 */
3453 void saHpiSensorReadingMinTable_set_commit( netsnmp_request_group *rg )
3454 {
3455- netsnmp_variable_list *var;
3456 // saHpiSensorReadingMinTable_context *row_ctx = (saHpiSensorReadingMinTable_context *)rg->existing_row;
3457 // saHpiSensorReadingMinTable_context *undo_ctx = (saHpiSensorReadingMinTable_context *)rg->undo_info;
3458 netsnmp_request_group_item *current;
3459@@ -794,7 +787,6 @@ void saHpiSensorReadingMinTable_set_comm
3460 */
3461 for ( current = rg->list; current; current = current->next ) {
3462
3463- var = current->ri->requestvb;
3464
3465 switch (current->tri->colnum) {
3466
3467@@ -819,7 +811,6 @@ void saHpiSensorReadingMinTable_set_comm
3468 */
3469 void saHpiSensorReadingMinTable_set_free( netsnmp_request_group *rg )
3470 {
3471- netsnmp_variable_list *var;
3472 // saHpiSensorReadingMinTable_context *row_ctx = (saHpiSensorReadingMinTable_context *)rg->existing_row;
3473 // saHpiSensorReadingMinTable_context *undo_ctx = (saHpiSensorReadingMinTable_context *)rg->undo_info;
3474 netsnmp_request_group_item *current;
3475@@ -831,7 +822,6 @@ void saHpiSensorReadingMinTable_set_free
3476 */
3477 for ( current = rg->list; current; current = current->next ) {
3478
3479- var = current->ri->requestvb;
3480
3481 switch (current->tri->colnum) {
3482
3483@@ -867,7 +857,6 @@ void saHpiSensorReadingMinTable_set_free
3484 */
3485 void saHpiSensorReadingMinTable_set_undo( netsnmp_request_group *rg )
3486 {
3487- netsnmp_variable_list *var;
3488 // saHpiSensorReadingMinTable_context *row_ctx = (saHpiSensorReadingMinTable_context *)rg->existing_row;
3489 // saHpiSensorReadingMinTable_context *undo_ctx = (saHpiSensorReadingMinTable_context *)rg->undo_info;
3490 netsnmp_request_group_item *current;
3491@@ -879,7 +868,6 @@ void saHpiSensorReadingMinTable_set_undo
3492 */
3493 for ( current = rg->list; current; current = current->next ) {
3494
3495- var = current->ri->requestvb;
3496
3497 switch (current->tri->colnum) {
3498
3499Index: openhpi-subagent-2.3.4/src/saHpiSensorReadingNominalTable.c
3500===================================================================
3501--- openhpi-subagent-2.3.4.orig/src/saHpiSensorReadingNominalTable.c
3502+++ openhpi-subagent-2.3.4/src/saHpiSensorReadingNominalTable.c
3503@@ -630,7 +630,6 @@ void saHpiSensorReadingNominalTable_set_
3504 // (saHpiSensorReadingNominalTable_context *)rg->existing_row;
3505 // saHpiSensorReadingNominalTable_context *undo_ctx =
3506 // (saHpiSensorReadingNominalTable_context *)rg->undo_info;
3507- netsnmp_variable_list *var;
3508 netsnmp_request_group_item *current;
3509 int rc;
3510
3511@@ -643,7 +642,6 @@ void saHpiSensorReadingNominalTable_set_
3512 */
3513 for ( current = rg->list; current; current = current->next ) {
3514
3515- var = current->ri->requestvb;
3516 rc = SNMP_ERR_NOERROR;
3517
3518 switch (current->tri->colnum) {
3519@@ -670,7 +668,6 @@ void saHpiSensorReadingNominalTable_set_
3520 // saHpiSensorReadingNominalTable_context *row_ctx = (saHpiSensorReadingNominalTable_context *)rg->existing_row;
3521 // saHpiSensorReadingNominalTable_context *undo_ctx = (saHpiSensorReadingNominalTable_context *)rg->undo_info;
3522 netsnmp_request_group_item *current;
3523- netsnmp_variable_list *var;
3524 int rc;
3525
3526 rg->rg_void = rg->list->ri;
3527@@ -681,7 +678,6 @@ void saHpiSensorReadingNominalTable_set_
3528 */
3529 for ( current = rg->list; current; current = current->next ) {
3530
3531- var = current->ri->requestvb;
3532 rc = SNMP_ERR_NOERROR;
3533
3534 switch (current->tri->colnum) {
3535@@ -713,7 +709,6 @@ void saHpiSensorReadingNominalTable_set_
3536 */
3537 void saHpiSensorReadingNominalTable_set_action( netsnmp_request_group *rg )
3538 {
3539- netsnmp_variable_list *var;
3540 // saHpiSensorReadingNominalTable_context *row_ctx = (saHpiSensorReadingNominalTable_context *)rg->existing_row;
3541 // saHpiSensorReadingNominalTable_context *undo_ctx = (saHpiSensorReadingNominalTable_context *)rg->undo_info;
3542 netsnmp_request_group_item *current;
3543@@ -727,7 +722,6 @@ void saHpiSensorReadingNominalTable_set_
3544 */
3545 for ( current = rg->list; current; current = current->next ) {
3546
3547- var = current->ri->requestvb;
3548
3549 switch (current->tri->colnum) {
3550
3551@@ -765,7 +759,6 @@ void saHpiSensorReadingNominalTable_set_
3552 */
3553 void saHpiSensorReadingNominalTable_set_commit( netsnmp_request_group *rg )
3554 {
3555- netsnmp_variable_list *var;
3556 // saHpiSensorReadingNominalTable_context *row_ctx = (saHpiSensorReadingNominalTable_context *)rg->existing_row;
3557 // saHpiSensorReadingNominalTable_context *undo_ctx = (saHpiSensorReadingNominalTable_context *)rg->undo_info;
3558 netsnmp_request_group_item *current;
3559@@ -775,7 +768,6 @@ void saHpiSensorReadingNominalTable_set_
3560 */
3561 for ( current = rg->list; current; current = current->next ) {
3562
3563- var = current->ri->requestvb;
3564
3565 switch (current->tri->colnum) {
3566
3567@@ -800,7 +792,6 @@ void saHpiSensorReadingNominalTable_set_
3568 */
3569 void saHpiSensorReadingNominalTable_set_free( netsnmp_request_group *rg )
3570 {
3571- netsnmp_variable_list *var;
3572 // saHpiSensorReadingNominalTable_context *row_ctx = (saHpiSensorReadingNominalTable_context *)rg->existing_row;
3573 // saHpiSensorReadingNominalTable_context *undo_ctx = (saHpiSensorReadingNominalTable_context *)rg->undo_info;
3574 netsnmp_request_group_item *current;
3575@@ -810,7 +801,6 @@ void saHpiSensorReadingNominalTable_set_
3576 */
3577 for ( current = rg->list; current; current = current->next ) {
3578
3579- var = current->ri->requestvb;
3580
3581 switch (current->tri->colnum) {
3582
3583@@ -847,7 +837,6 @@ void saHpiSensorReadingNominalTable_set_
3584 */
3585 void saHpiSensorReadingNominalTable_set_undo( netsnmp_request_group *rg )
3586 {
3587- netsnmp_variable_list *var;
3588 // saHpiSensorReadingNominalTable_context *row_ctx = (saHpiSensorReadingNominalTable_context *)rg->existing_row;
3589 // saHpiSensorReadingNominalTable_context *undo_ctx = (saHpiSensorReadingNominalTable_context *)rg->undo_info;
3590 netsnmp_request_group_item *current;
3591@@ -857,7 +846,6 @@ void saHpiSensorReadingNominalTable_set_
3592 */
3593 for ( current = rg->list; current; current = current->next ) {
3594
3595- var = current->ri->requestvb;
3596
3597 switch (current->tri->colnum) {
3598
3599Index: openhpi-subagent-2.3.4/src/saHpiSensorReadingNormalMaxTable.c
3600===================================================================
3601--- openhpi-subagent-2.3.4.orig/src/saHpiSensorReadingNormalMaxTable.c
3602+++ openhpi-subagent-2.3.4/src/saHpiSensorReadingNormalMaxTable.c
3603@@ -643,7 +643,6 @@ void saHpiSensorReadingNormalMaxTable_se
3604 // (saHpiSensorReadingNormalMaxTable_context *)rg->existing_row;
3605 // saHpiSensorReadingNormalMaxTable_context *undo_ctx =
3606 // (saHpiSensorReadingNormalMaxTable_context *)rg->undo_info;
3607- netsnmp_variable_list *var;
3608 netsnmp_request_group_item *current;
3609 int rc;
3610
3611@@ -657,7 +656,6 @@ void saHpiSensorReadingNormalMaxTable_se
3612 */
3613 for ( current = rg->list; current; current = current->next ) {
3614
3615- var = current->ri->requestvb;
3616 rc = SNMP_ERR_NOERROR;
3617
3618 switch (current->tri->colnum) {
3619@@ -686,7 +684,6 @@ void saHpiSensorReadingNormalMaxTable_se
3620 // saHpiSensorReadingNormalMaxTable_context *undo_ctx =
3621 // (saHpiSensorReadingNormalMaxTable_context *)rg->undo_info;
3622 netsnmp_request_group_item *current;
3623- netsnmp_variable_list *var;
3624 int rc;
3625
3626 DEBUGMSGTL ((AGENT, "saHpiSensorReadingNormalMaxTable_set_reserve2, called\n"));
3627@@ -699,7 +696,6 @@ void saHpiSensorReadingNormalMaxTable_se
3628 */
3629 for ( current = rg->list; current; current = current->next ) {
3630
3631- var = current->ri->requestvb;
3632 rc = SNMP_ERR_NOERROR;
3633
3634 switch (current->tri->colnum) {
3635@@ -731,7 +727,6 @@ void saHpiSensorReadingNormalMaxTable_se
3636 */
3637 void saHpiSensorReadingNormalMaxTable_set_action( netsnmp_request_group *rg )
3638 {
3639- netsnmp_variable_list *var;
3640 // saHpiSensorReadingNormalMaxTable_context *row_ctx = (saHpiSensorReadingNormalMaxTable_context *)rg->existing_row;
3641 // saHpiSensorReadingNormalMaxTable_context *undo_ctx = (saHpiSensorReadingNormalMaxTable_context *)rg->undo_info;
3642 netsnmp_request_group_item *current;
3643@@ -747,7 +742,6 @@ void saHpiSensorReadingNormalMaxTable_se
3644 */
3645 for ( current = rg->list; current; current = current->next ) {
3646
3647- var = current->ri->requestvb;
3648
3649 switch (current->tri->colnum) {
3650
3651@@ -784,7 +778,6 @@ void saHpiSensorReadingNormalMaxTable_se
3652 */
3653 void saHpiSensorReadingNormalMaxTable_set_commit( netsnmp_request_group *rg )
3654 {
3655- netsnmp_variable_list *var;
3656 // saHpiSensorReadingNormalMaxTable_context *row_ctx = (saHpiSensorReadingNormalMaxTable_context *)rg->existing_row;
3657 // saHpiSensorReadingNormalMaxTable_context *undo_ctx = (saHpiSensorReadingNormalMaxTable_context *)rg->undo_info;
3658 netsnmp_request_group_item *current;
3659@@ -796,7 +789,6 @@ void saHpiSensorReadingNormalMaxTable_se
3660 */
3661 for ( current = rg->list; current; current = current->next ) {
3662
3663- var = current->ri->requestvb;
3664
3665 switch (current->tri->colnum) {
3666
3667@@ -821,7 +813,6 @@ void saHpiSensorReadingNormalMaxTable_se
3668 */
3669 void saHpiSensorReadingNormalMaxTable_set_free( netsnmp_request_group *rg )
3670 {
3671- netsnmp_variable_list *var;
3672 // saHpiSensorReadingNormalMaxTable_context *row_ctx = (saHpiSensorReadingNormalMaxTable_context *)rg->existing_row;
3673 // saHpiSensorReadingNormalMaxTable_context *undo_ctx = (saHpiSensorReadingNormalMaxTable_context *)rg->undo_info;
3674 netsnmp_request_group_item *current;
3675@@ -833,7 +824,6 @@ void saHpiSensorReadingNormalMaxTable_se
3676 */
3677 for ( current = rg->list; current; current = current->next ) {
3678
3679- var = current->ri->requestvb;
3680
3681 switch (current->tri->colnum) {
3682
3683@@ -870,7 +860,6 @@ void saHpiSensorReadingNormalMaxTable_se
3684 */
3685 void saHpiSensorReadingNormalMaxTable_set_undo( netsnmp_request_group *rg )
3686 {
3687- netsnmp_variable_list *var;
3688 // saHpiSensorReadingNormalMaxTable_context *row_ctx = (saHpiSensorReadingNormalMaxTable_context *)rg->existing_row;
3689 // saHpiSensorReadingNormalMaxTable_context *undo_ctx = (saHpiSensorReadingNormalMaxTable_context *)rg->undo_info;
3690 netsnmp_request_group_item *current;
3691@@ -882,7 +871,6 @@ void saHpiSensorReadingNormalMaxTable_se
3692 */
3693 for ( current = rg->list; current; current = current->next ) {
3694
3695- var = current->ri->requestvb;
3696
3697 switch (current->tri->colnum) {
3698
3699Index: openhpi-subagent-2.3.4/src/saHpiSensorReadingNormalMinTable.c
3700===================================================================
3701--- openhpi-subagent-2.3.4.orig/src/saHpiSensorReadingNormalMinTable.c
3702+++ openhpi-subagent-2.3.4/src/saHpiSensorReadingNormalMinTable.c
3703@@ -648,7 +648,6 @@ void saHpiSensorReadingNormalMinTable_se
3704 // (saHpiSensorReadingNormalMinTable_context *)rg->existing_row;
3705 // saHpiSensorReadingNormalMinTable_context *undo_ctx =
3706 // (saHpiSensorReadingNormalMinTable_context *)rg->undo_info;
3707- netsnmp_variable_list *var;
3708 netsnmp_request_group_item *current;
3709 int rc;
3710
3711@@ -662,7 +661,6 @@ void saHpiSensorReadingNormalMinTable_se
3712 */
3713 for ( current = rg->list; current; current = current->next ) {
3714
3715- var = current->ri->requestvb;
3716 rc = SNMP_ERR_NOERROR;
3717
3718 switch (current->tri->colnum) {
3719@@ -689,7 +687,6 @@ void saHpiSensorReadingNormalMinTable_se
3720 // saHpiSensorReadingNormalMinTable_context *row_ctx = (saHpiSensorReadingNormalMinTable_context *)rg->existing_row;
3721 // saHpiSensorReadingNormalMinTable_context *undo_ctx = (saHpiSensorReadingNormalMinTable_context *)rg->undo_info;
3722 netsnmp_request_group_item *current;
3723- netsnmp_variable_list *var;
3724 int rc;
3725
3726 DEBUGMSGTL ((AGENT, "saHpiSensorReadingNormalMinTable_set_reserve2, called\n"));
3727@@ -702,7 +699,6 @@ void saHpiSensorReadingNormalMinTable_se
3728 */
3729 for ( current = rg->list; current; current = current->next ) {
3730
3731- var = current->ri->requestvb;
3732 rc = SNMP_ERR_NOERROR;
3733
3734 switch (current->tri->colnum) {
3735@@ -734,7 +730,6 @@ void saHpiSensorReadingNormalMinTable_se
3736 */
3737 void saHpiSensorReadingNormalMinTable_set_action( netsnmp_request_group *rg )
3738 {
3739- netsnmp_variable_list *var;
3740 // saHpiSensorReadingNormalMinTable_context *row_ctx =
3741 // (saHpiSensorReadingNormalMinTable_context *)rg->existing_row;
3742 // saHpiSensorReadingNormalMinTable_context *undo_ctx =
3743@@ -752,7 +747,6 @@ void saHpiSensorReadingNormalMinTable_se
3744 */
3745 for ( current = rg->list; current; current = current->next ) {
3746
3747- var = current->ri->requestvb;
3748
3749 switch (current->tri->colnum) {
3750
3751@@ -789,7 +783,6 @@ void saHpiSensorReadingNormalMinTable_se
3752 */
3753 void saHpiSensorReadingNormalMinTable_set_commit( netsnmp_request_group *rg )
3754 {
3755- netsnmp_variable_list *var;
3756 // saHpiSensorReadingNormalMinTable_context *row_ctx =
3757 // (saHpiSensorReadingNormalMinTable_context *)rg->existing_row;
3758 // saHpiSensorReadingNormalMinTable_context *undo_ctx =
3759@@ -803,7 +796,6 @@ void saHpiSensorReadingNormalMinTable_se
3760 */
3761 for ( current = rg->list; current; current = current->next ) {
3762
3763- var = current->ri->requestvb;
3764
3765 switch (current->tri->colnum) {
3766
3767@@ -828,7 +820,6 @@ void saHpiSensorReadingNormalMinTable_se
3768 */
3769 void saHpiSensorReadingNormalMinTable_set_free( netsnmp_request_group *rg )
3770 {
3771- netsnmp_variable_list *var;
3772 // saHpiSensorReadingNormalMinTable_context *row_ctx =
3773 // (saHpiSensorReadingNormalMinTable_context *)rg->existing_row;
3774 // saHpiSensorReadingNormalMinTable_context *undo_ctx =
3775@@ -842,7 +833,6 @@ void saHpiSensorReadingNormalMinTable_se
3776 */
3777 for ( current = rg->list; current; current = current->next ) {
3778
3779- var = current->ri->requestvb;
3780
3781 switch (current->tri->colnum) {
3782
3783@@ -879,7 +869,6 @@ void saHpiSensorReadingNormalMinTable_se
3784 */
3785 void saHpiSensorReadingNormalMinTable_set_undo( netsnmp_request_group *rg )
3786 {
3787- netsnmp_variable_list *var;
3788 // saHpiSensorReadingNormalMinTable_context *row_ctx =
3789 // (saHpiSensorReadingNormalMinTable_context *)rg->existing_row;
3790 // saHpiSensorReadingNormalMinTable_context *undo_ctx =
3791@@ -893,7 +882,6 @@ void saHpiSensorReadingNormalMinTable_se
3792 */
3793 for ( current = rg->list; current; current = current->next ) {
3794
3795- var = current->ri->requestvb;
3796
3797 switch (current->tri->colnum) {
3798
3799Index: openhpi-subagent-2.3.4/src/saHpiSensorTable.c
3800===================================================================
3801--- openhpi-subagent-2.3.4.orig/src/saHpiSensorTable.c
3802+++ openhpi-subagent-2.3.4/src/saHpiSensorTable.c
3803@@ -1043,7 +1043,6 @@ void saHpiSensorTable_set_reserve1( nets
3804 // (saHpiSensorTable_context *)rg->existing_row;
3805 // saHpiSensorTable_context *undo_ctx =
3806 // (saHpiSensorTable_context *)rg->undo_info;
3807- netsnmp_variable_list *var;
3808 netsnmp_request_group_item *current;
3809 int rc;
3810
3811@@ -1057,7 +1056,6 @@ void saHpiSensorTable_set_reserve1( nets
3812 */
3813 for( current = rg->list; current; current = current->next ) {
3814
3815- var = current->ri->requestvb;
3816 rc = SNMP_ERR_NOERROR;
3817
3818 switch(current->tri->colnum) {
3819@@ -1084,7 +1082,6 @@ void saHpiSensorTable_set_reserve2( nets
3820 // saHpiSensorTable_context *row_ctx = (saHpiSensorTable_context *)rg->existing_row;
3821 // saHpiSensorTable_context *undo_ctx = (saHpiSensorTable_context *)rg->undo_info;
3822 netsnmp_request_group_item *current;
3823- netsnmp_variable_list *var;
3824 int rc;
3825
3826 DEBUGMSGTL ((AGENT, "saHpiSensorTable_set_reserve2, called\n"));
3827@@ -1097,7 +1094,6 @@ void saHpiSensorTable_set_reserve2( nets
3828 */
3829 for( current = rg->list; current; current = current->next ) {
3830
3831- var = current->ri->requestvb;
3832 rc = SNMP_ERR_NOERROR;
3833
3834 switch(current->tri->colnum) {
3835@@ -1129,7 +1125,6 @@ void saHpiSensorTable_set_reserve2( nets
3836 */
3837 void saHpiSensorTable_set_action( netsnmp_request_group *rg )
3838 {
3839- netsnmp_variable_list *var;
3840 // saHpiSensorTable_context *row_ctx = (saHpiSensorTable_context *)rg->existing_row;
3841 // saHpiSensorTable_context *undo_ctx = (saHpiSensorTable_context *)rg->undo_info;
3842 netsnmp_request_group_item *current;
3843@@ -1145,7 +1140,6 @@ void saHpiSensorTable_set_action( netsnm
3844 */
3845 for( current = rg->list; current; current = current->next ) {
3846
3847- var = current->ri->requestvb;
3848
3849 switch(current->tri->colnum) {
3850
3851@@ -1182,7 +1176,6 @@ void saHpiSensorTable_set_action( netsnm
3852 */
3853 void saHpiSensorTable_set_commit( netsnmp_request_group *rg )
3854 {
3855- netsnmp_variable_list *var;
3856 // saHpiSensorTable_context *row_ctx = (saHpiSensorTable_context *)rg->existing_row;
3857 // saHpiSensorTable_context *undo_ctx = (saHpiSensorTable_context *)rg->undo_info;
3858 netsnmp_request_group_item *current;
3859@@ -1194,7 +1187,6 @@ void saHpiSensorTable_set_commit( netsnm
3860 */
3861 for( current = rg->list; current; current = current->next ) {
3862
3863- var = current->ri->requestvb;
3864
3865 switch(current->tri->colnum) {
3866
3867@@ -1219,7 +1211,6 @@ void saHpiSensorTable_set_commit( netsnm
3868 */
3869 void saHpiSensorTable_set_free( netsnmp_request_group *rg )
3870 {
3871- netsnmp_variable_list *var;
3872 // saHpiSensorTable_context *row_ctx = (saHpiSensorTable_context *)rg->existing_row;
3873 // saHpiSensorTable_context *undo_ctx = (saHpiSensorTable_context *)rg->undo_info;
3874 netsnmp_request_group_item *current;
3875@@ -1231,7 +1222,6 @@ void saHpiSensorTable_set_free( netsnmp_
3876 */
3877 for( current = rg->list; current; current = current->next ) {
3878
3879- var = current->ri->requestvb;
3880
3881 switch(current->tri->colnum) {
3882
3883@@ -1266,7 +1256,6 @@ void saHpiSensorTable_set_free( netsnmp_
3884 */
3885 void saHpiSensorTable_set_undo( netsnmp_request_group *rg )
3886 {
3887- netsnmp_variable_list *var;
3888 // saHpiSensorTable_context *row_ctx = (saHpiSensorTable_context *)rg->existing_row;
3889 // saHpiSensorTable_context *undo_ctx = (saHpiSensorTable_context *)rg->undo_info;
3890 netsnmp_request_group_item *current;
3891@@ -1278,7 +1267,6 @@ void saHpiSensorTable_set_undo( netsnmp_
3892 */
3893 for( current = rg->list; current; current = current->next ) {
3894
3895- var = current->ri->requestvb;
3896
3897 switch(current->tri->colnum) {
3898
3899Index: openhpi-subagent-2.3.4/src/saHpiSensorThdLowCriticalTable.c
3900===================================================================
3901--- openhpi-subagent-2.3.4.orig/src/saHpiSensorThdLowCriticalTable.c
3902+++ openhpi-subagent-2.3.4/src/saHpiSensorThdLowCriticalTable.c
3903@@ -776,7 +776,6 @@ void saHpiSensorThdLowCriticalTable_set_
3904 // saHpiSensorThdLowCriticalTable_context *undo_ctx =
3905 // (saHpiSensorThdLowCriticalTable_context *)rg->undo_info;
3906 netsnmp_request_group_item *current;
3907- netsnmp_variable_list *var;
3908 int rc;
3909
3910 DEBUGMSGTL ((AGENT, "saHpiSensorThdLowCriticalTable_set_reserve2, called\n"));
3911@@ -789,7 +788,6 @@ void saHpiSensorThdLowCriticalTable_set_
3912 */
3913 for ( current = rg->list; current; current = current->next ) {
3914
3915- var = current->ri->requestvb;
3916 rc = SNMP_ERR_NOERROR;
3917
3918 switch (current->tri->colnum) {
3919@@ -897,7 +895,6 @@ void saHpiSensorThdLowCriticalTable_set_
3920 */
3921 void saHpiSensorThdLowCriticalTable_set_commit( netsnmp_request_group *rg )
3922 {
3923- netsnmp_variable_list *var;
3924 // saHpiSensorThdLowCriticalTable_context *row_ctx =
3925 // (saHpiSensorThdLowCriticalTable_context *)rg->existing_row;
3926 // saHpiSensorThdLowCriticalTable_context *undo_ctx =
3927@@ -911,7 +908,6 @@ void saHpiSensorThdLowCriticalTable_set_
3928 */
3929 for ( current = rg->list; current; current = current->next ) {
3930
3931- var = current->ri->requestvb;
3932
3933 switch (current->tri->colnum) {
3934
3935@@ -940,7 +936,6 @@ void saHpiSensorThdLowCriticalTable_set_
3936 */
3937 void saHpiSensorThdLowCriticalTable_set_free( netsnmp_request_group *rg )
3938 {
3939- netsnmp_variable_list *var;
3940 // saHpiSensorThdLowCriticalTable_context *row_ctx =
3941 // (saHpiSensorThdLowCriticalTable_context *)rg->existing_row;
3942 // saHpiSensorThdLowCriticalTable_context *undo_ctx =
3943@@ -954,7 +949,6 @@ void saHpiSensorThdLowCriticalTable_set_
3944 */
3945 for ( current = rg->list; current; current = current->next ) {
3946
3947- var = current->ri->requestvb;
3948
3949 switch (current->tri->colnum) {
3950
3951@@ -995,7 +989,6 @@ void saHpiSensorThdLowCriticalTable_set_
3952 */
3953 void saHpiSensorThdLowCriticalTable_set_undo( netsnmp_request_group *rg )
3954 {
3955- netsnmp_variable_list *var;
3956 // saHpiSensorThdLowCriticalTable_context *row_ctx =
3957 // (saHpiSensorThdLowCriticalTable_context *)rg->existing_row;
3958 // saHpiSensorThdLowCriticalTable_context *undo_ctx =
3959@@ -1009,7 +1002,6 @@ void saHpiSensorThdLowCriticalTable_set_
3960 */
3961 for ( current = rg->list; current; current = current->next ) {
3962
3963- var = current->ri->requestvb;
3964
3965 switch (current->tri->colnum) {
3966
3967Index: openhpi-subagent-2.3.4/src/saHpiSensorThdLowMajorTable.c
3968===================================================================
3969--- openhpi-subagent-2.3.4.orig/src/saHpiSensorThdLowMajorTable.c
3970+++ openhpi-subagent-2.3.4/src/saHpiSensorThdLowMajorTable.c
3971@@ -774,7 +774,6 @@ void saHpiSensorThdLowMajorTable_set_res
3972 // saHpiSensorThdLowMajorTable_context *row_ctx = (saHpiSensorThdLowMajorTable_context *)rg->existing_row;
3973 // saHpiSensorThdLowMajorTable_context *undo_ctx = (saHpiSensorThdLowMajorTable_context *)rg->undo_info;
3974 netsnmp_request_group_item *current;
3975- netsnmp_variable_list *var;
3976 int rc;
3977
3978 DEBUGMSGTL ((AGENT, "saHpiSensorThdLowMajorTable_set_reserve2, called\n"));
3979@@ -787,7 +786,6 @@ void saHpiSensorThdLowMajorTable_set_res
3980 */
3981 for ( current = rg->list; current; current = current->next ) {
3982
3983- var = current->ri->requestvb;
3984 rc = SNMP_ERR_NOERROR;
3985
3986 switch (current->tri->colnum) {
3987@@ -895,7 +893,6 @@ void saHpiSensorThdLowMajorTable_set_act
3988 */
3989 void saHpiSensorThdLowMajorTable_set_commit( netsnmp_request_group *rg )
3990 {
3991- netsnmp_variable_list *var;
3992 // saHpiSensorThdLowMajorTable_context *row_ctx = (saHpiSensorThdLowMajorTable_context *)rg->existing_row;
3993 // saHpiSensorThdLowMajorTable_context *undo_ctx = (saHpiSensorThdLowMajorTable_context *)rg->undo_info;
3994 netsnmp_request_group_item *current;
3995@@ -907,7 +904,6 @@ void saHpiSensorThdLowMajorTable_set_com
3996 */
3997 for ( current = rg->list; current; current = current->next ) {
3998
3999- var = current->ri->requestvb;
4000
4001 switch (current->tri->colnum) {
4002
4003@@ -936,7 +932,6 @@ void saHpiSensorThdLowMajorTable_set_com
4004 */
4005 void saHpiSensorThdLowMajorTable_set_free( netsnmp_request_group *rg )
4006 {
4007- netsnmp_variable_list *var;
4008 // saHpiSensorThdLowMajorTable_context *row_ctx = (saHpiSensorThdLowMajorTable_context *)rg->existing_row;
4009 // saHpiSensorThdLowMajorTable_context *undo_ctx = (saHpiSensorThdLowMajorTable_context *)rg->undo_info;
4010 netsnmp_request_group_item *current;
4011@@ -948,7 +943,6 @@ void saHpiSensorThdLowMajorTable_set_fre
4012 */
4013 for ( current = rg->list; current; current = current->next ) {
4014
4015- var = current->ri->requestvb;
4016
4017 switch (current->tri->colnum) {
4018
4019@@ -989,7 +983,6 @@ void saHpiSensorThdLowMajorTable_set_fre
4020 */
4021 void saHpiSensorThdLowMajorTable_set_undo( netsnmp_request_group *rg )
4022 {
4023- netsnmp_variable_list *var;
4024 // saHpiSensorThdLowMajorTable_context *row_ctx = (saHpiSensorThdLowMajorTable_context *)rg->existing_row;
4025 // saHpiSensorThdLowMajorTable_context *undo_ctx = (saHpiSensorThdLowMajorTable_context *)rg->undo_info;
4026 netsnmp_request_group_item *current;
4027@@ -1001,7 +994,6 @@ void saHpiSensorThdLowMajorTable_set_und
4028 */
4029 for ( current = rg->list; current; current = current->next ) {
4030
4031- var = current->ri->requestvb;
4032
4033 switch (current->tri->colnum) {
4034
4035Index: openhpi-subagent-2.3.4/src/saHpiSensorThdLowMinorTable.c
4036===================================================================
4037--- openhpi-subagent-2.3.4.orig/src/saHpiSensorThdLowMinorTable.c
4038+++ openhpi-subagent-2.3.4/src/saHpiSensorThdLowMinorTable.c
4039@@ -782,7 +782,6 @@ void saHpiSensorThdLowMinorTable_set_res
4040 // saHpiSensorThdLowMinorTable_context *undo_ctx =
4041 // (saHpiSensorThdLowMinorTable_context *)rg->undo_info;
4042 netsnmp_request_group_item *current;
4043- netsnmp_variable_list *var;
4044 int rc;
4045
4046 DEBUGMSGTL ((AGENT, "saHpiSensorThdLowMinorTable_set_reserve2, called\n"));
4047@@ -795,7 +794,6 @@ void saHpiSensorThdLowMinorTable_set_res
4048 */
4049 for( current = rg->list; current; current = current->next ) {
4050
4051- var = current->ri->requestvb;
4052 rc = SNMP_ERR_NOERROR;
4053
4054 switch(current->tri->colnum) {
4055@@ -904,7 +902,6 @@ void saHpiSensorThdLowMinorTable_set_act
4056 */
4057 void saHpiSensorThdLowMinorTable_set_commit( netsnmp_request_group *rg )
4058 {
4059- netsnmp_variable_list *var;
4060 // saHpiSensorThdLowMinorTable_context *row_ctx =
4061 // (saHpiSensorThdLowMinorTable_context *)rg->existing_row;
4062 // saHpiSensorThdLowMinorTable_context *undo_ctx =
4063@@ -918,7 +915,6 @@ void saHpiSensorThdLowMinorTable_set_com
4064 */
4065 for( current = rg->list; current; current = current->next ) {
4066
4067- var = current->ri->requestvb;
4068
4069 switch(current->tri->colnum) {
4070
4071@@ -947,7 +943,6 @@ void saHpiSensorThdLowMinorTable_set_com
4072 */
4073 void saHpiSensorThdLowMinorTable_set_free( netsnmp_request_group *rg )
4074 {
4075- netsnmp_variable_list *var;
4076 // saHpiSensorThdLowMinorTable_context *row_ctx =
4077 // (saHpiSensorThdLowMinorTable_context *)rg->existing_row;
4078 // saHpiSensorThdLowMinorTable_context *undo_ctx =
4079@@ -961,7 +956,6 @@ void saHpiSensorThdLowMinorTable_set_fre
4080 */
4081 for( current = rg->list; current; current = current->next ) {
4082
4083- var = current->ri->requestvb;
4084
4085 switch(current->tri->colnum) {
4086
4087@@ -1002,7 +996,6 @@ void saHpiSensorThdLowMinorTable_set_fre
4088 */
4089 void saHpiSensorThdLowMinorTable_set_undo( netsnmp_request_group *rg )
4090 {
4091- netsnmp_variable_list *var;
4092 // saHpiSensorThdLowMinorTable_context *row_ctx =
4093 // (saHpiSensorThdLowMinorTable_context *)rg->existing_row;
4094 // saHpiSensorThdLowMinorTable_context *undo_ctx =
4095@@ -1016,7 +1009,6 @@ void saHpiSensorThdLowMinorTable_set_und
4096 */
4097 for( current = rg->list; current; current = current->next ) {
4098
4099- var = current->ri->requestvb;
4100
4101 switch(current->tri->colnum) {
4102
4103Index: openhpi-subagent-2.3.4/src/saHpiSensorThdNegHysteresisTable.c
4104===================================================================
4105--- openhpi-subagent-2.3.4.orig/src/saHpiSensorThdNegHysteresisTable.c
4106+++ openhpi-subagent-2.3.4/src/saHpiSensorThdNegHysteresisTable.c
4107@@ -769,7 +769,6 @@ void saHpiSensorThdNegHysteresisTable_se
4108 // saHpiSensorThdNegHysteresisTable_context *row_ctx = (saHpiSensorThdNegHysteresisTable_context *)rg->existing_row;
4109 // saHpiSensorThdNegHysteresisTable_context *undo_ctx = (saHpiSensorThdNegHysteresisTable_context *)rg->undo_info;
4110 netsnmp_request_group_item *current;
4111- netsnmp_variable_list *var;
4112 int rc;
4113
4114 DEBUGMSGTL ((AGENT, "saHpiSensorThdNegHysteresisTable_set_reserve2 called\n"));
4115@@ -782,7 +781,6 @@ void saHpiSensorThdNegHysteresisTable_se
4116 */
4117 for ( current = rg->list; current; current = current->next ) {
4118
4119- var = current->ri->requestvb;
4120 rc = SNMP_ERR_NOERROR;
4121
4122 switch (current->tri->colnum) {
4123@@ -889,7 +887,6 @@ void saHpiSensorThdNegHysteresisTable_se
4124 */
4125 void saHpiSensorThdNegHysteresisTable_set_commit( netsnmp_request_group *rg )
4126 {
4127- netsnmp_variable_list *var;
4128 // saHpiSensorThdNegHysteresisTable_context *row_ctx = (saHpiSensorThdNegHysteresisTable_context *)rg->existing_row;
4129 // saHpiSensorThdNegHysteresisTable_context *undo_ctx = (saHpiSensorThdNegHysteresisTable_context *)rg->undo_info;
4130 netsnmp_request_group_item *current;
4131@@ -901,7 +898,6 @@ void saHpiSensorThdNegHysteresisTable_se
4132 */
4133 for ( current = rg->list; current; current = current->next ) {
4134
4135- var = current->ri->requestvb;
4136
4137 switch (current->tri->colnum) {
4138
4139@@ -930,7 +926,6 @@ void saHpiSensorThdNegHysteresisTable_se
4140 */
4141 void saHpiSensorThdNegHysteresisTable_set_free( netsnmp_request_group *rg )
4142 {
4143- netsnmp_variable_list *var;
4144 // saHpiSensorThdNegHysteresisTable_context *row_ctx = (saHpiSensorThdNegHysteresisTable_context *)rg->existing_row;
4145 // saHpiSensorThdNegHysteresisTable_context *undo_ctx = (saHpiSensorThdNegHysteresisTable_context *)rg->undo_info;
4146 netsnmp_request_group_item *current;
4147@@ -942,7 +937,6 @@ void saHpiSensorThdNegHysteresisTable_se
4148 */
4149 for ( current = rg->list; current; current = current->next ) {
4150
4151- var = current->ri->requestvb;
4152
4153 switch (current->tri->colnum) {
4154
4155@@ -983,7 +977,6 @@ void saHpiSensorThdNegHysteresisTable_se
4156 */
4157 void saHpiSensorThdNegHysteresisTable_set_undo( netsnmp_request_group *rg )
4158 {
4159- netsnmp_variable_list *var;
4160 // saHpiSensorThdNegHysteresisTable_context *row_ctx = (saHpiSensorThdNegHysteresisTable_context *)rg->existing_row;
4161 // saHpiSensorThdNegHysteresisTable_context *undo_ctx = (saHpiSensorThdNegHysteresisTable_context *)rg->undo_info;
4162 netsnmp_request_group_item *current;
4163@@ -995,7 +988,6 @@ void saHpiSensorThdNegHysteresisTable_se
4164 */
4165 for ( current = rg->list; current; current = current->next ) {
4166
4167- var = current->ri->requestvb;
4168
4169 switch (current->tri->colnum) {
4170
4171Index: openhpi-subagent-2.3.4/src/saHpiSensorThdPosHysteresisTable.c
4172===================================================================
4173--- openhpi-subagent-2.3.4.orig/src/saHpiSensorThdPosHysteresisTable.c
4174+++ openhpi-subagent-2.3.4/src/saHpiSensorThdPosHysteresisTable.c
4175@@ -764,7 +764,6 @@ void saHpiSensorThdPosHysteresisTable_se
4176 // saHpiSensorThdPosHysteresisTable_context *row_ctx = (saHpiSensorThdPosHysteresisTable_context *)rg->existing_row;
4177 // saHpiSensorThdPosHysteresisTable_context *undo_ctx = (saHpiSensorThdPosHysteresisTable_context *)rg->undo_info;
4178 netsnmp_request_group_item *current;
4179- netsnmp_variable_list *var;
4180 int rc;
4181
4182 DEBUGMSGTL ((AGENT, "saHpiSensorThdPosHysteresisTable_set_reserve2, called\n"));
4183@@ -777,7 +776,6 @@ void saHpiSensorThdPosHysteresisTable_se
4184 */
4185 for ( current = rg->list; current; current = current->next ) {
4186
4187- var = current->ri->requestvb;
4188 rc = SNMP_ERR_NOERROR;
4189
4190 switch (current->tri->colnum) {
4191@@ -883,7 +881,6 @@ void saHpiSensorThdPosHysteresisTable_se
4192 */
4193 void saHpiSensorThdPosHysteresisTable_set_commit( netsnmp_request_group *rg )
4194 {
4195- netsnmp_variable_list *var;
4196 // saHpiSensorThdPosHysteresisTable_context *row_ctx = (saHpiSensorThdPosHysteresisTable_context *)rg->existing_row;
4197 // saHpiSensorThdPosHysteresisTable_context *undo_ctx = (saHpiSensorThdPosHysteresisTable_context *)rg->undo_info;
4198 netsnmp_request_group_item *current;
4199@@ -895,7 +892,6 @@ void saHpiSensorThdPosHysteresisTable_se
4200 */
4201 for ( current = rg->list; current; current = current->next ) {
4202
4203- var = current->ri->requestvb;
4204
4205 switch (current->tri->colnum) {
4206
4207@@ -924,7 +920,6 @@ void saHpiSensorThdPosHysteresisTable_se
4208 */
4209 void saHpiSensorThdPosHysteresisTable_set_free( netsnmp_request_group *rg )
4210 {
4211- netsnmp_variable_list *var;
4212 // saHpiSensorThdPosHysteresisTable_context *row_ctx = (saHpiSensorThdPosHysteresisTable_context *)rg->existing_row;
4213 // saHpiSensorThdPosHysteresisTable_context *undo_ctx = (saHpiSensorThdPosHysteresisTable_context *)rg->undo_info;
4214 netsnmp_request_group_item *current;
4215@@ -936,7 +931,6 @@ void saHpiSensorThdPosHysteresisTable_se
4216 */
4217 for ( current = rg->list; current; current = current->next ) {
4218
4219- var = current->ri->requestvb;
4220
4221 switch (current->tri->colnum) {
4222
4223@@ -977,7 +971,6 @@ void saHpiSensorThdPosHysteresisTable_se
4224 */
4225 void saHpiSensorThdPosHysteresisTable_set_undo( netsnmp_request_group *rg )
4226 {
4227- netsnmp_variable_list *var;
4228 // saHpiSensorThdPosHysteresisTable_context *row_ctx = (saHpiSensorThdPosHysteresisTable_context *)rg->existing_row;
4229 // saHpiSensorThdPosHysteresisTable_context *undo_ctx = (saHpiSensorThdPosHysteresisTable_context *)rg->undo_info;
4230 netsnmp_request_group_item *current;
4231@@ -989,7 +982,6 @@ void saHpiSensorThdPosHysteresisTable_se
4232 */
4233 for ( current = rg->list; current; current = current->next ) {
4234
4235- var = current->ri->requestvb;
4236
4237 switch (current->tri->colnum) {
4238
4239Index: openhpi-subagent-2.3.4/src/saHpiSensorThdUpCriticalTable.c
4240===================================================================
4241--- openhpi-subagent-2.3.4.orig/src/saHpiSensorThdUpCriticalTable.c
4242+++ openhpi-subagent-2.3.4/src/saHpiSensorThdUpCriticalTable.c
4243@@ -766,7 +766,6 @@ void saHpiSensorThdUpCriticalTable_set_r
4244 // saHpiSensorThdUpCriticalTable_context *row_ctx = (saHpiSensorThdUpCriticalTable_context *)rg->existing_row;
4245 // saHpiSensorThdUpCriticalTable_context *undo_ctx = (saHpiSensorThdUpCriticalTable_context *)rg->undo_info;
4246 netsnmp_request_group_item *current;
4247- netsnmp_variable_list *var;
4248 int rc;
4249
4250 DEBUGMSGTL ((AGENT, "saHpiSensorThdUpCriticalTable_set_reserve2, called\n"));
4251@@ -779,7 +778,6 @@ void saHpiSensorThdUpCriticalTable_set_r
4252 */
4253 for( current = rg->list; current; current = current->next ) {
4254
4255- var = current->ri->requestvb;
4256 rc = SNMP_ERR_NOERROR;
4257
4258 switch(current->tri->colnum) {
4259@@ -885,7 +883,6 @@ void saHpiSensorThdUpCriticalTable_set_a
4260 */
4261 void saHpiSensorThdUpCriticalTable_set_commit( netsnmp_request_group *rg )
4262 {
4263- netsnmp_variable_list *var;
4264 // saHpiSensorThdUpCriticalTable_context *row_ctx = (saHpiSensorThdUpCriticalTable_context *)rg->existing_row;
4265 // saHpiSensorThdUpCriticalTable_context *undo_ctx = (saHpiSensorThdUpCriticalTable_context *)rg->undo_info;
4266 netsnmp_request_group_item *current;
4267@@ -897,7 +894,6 @@ void saHpiSensorThdUpCriticalTable_set_c
4268 */
4269 for( current = rg->list; current; current = current->next ) {
4270
4271- var = current->ri->requestvb;
4272
4273 switch(current->tri->colnum) {
4274
4275@@ -926,7 +922,6 @@ void saHpiSensorThdUpCriticalTable_set_c
4276 */
4277 void saHpiSensorThdUpCriticalTable_set_free( netsnmp_request_group *rg )
4278 {
4279- netsnmp_variable_list *var;
4280 // saHpiSensorThdUpCriticalTable_context *row_ctx = (saHpiSensorThdUpCriticalTable_context *)rg->existing_row;
4281 // saHpiSensorThdUpCriticalTable_context *undo_ctx = (saHpiSensorThdUpCriticalTable_context *)rg->undo_info;
4282 netsnmp_request_group_item *current;
4283@@ -938,7 +933,6 @@ void saHpiSensorThdUpCriticalTable_set_f
4284 */
4285 for( current = rg->list; current; current = current->next ) {
4286
4287- var = current->ri->requestvb;
4288
4289 switch(current->tri->colnum) {
4290
4291@@ -979,7 +973,6 @@ void saHpiSensorThdUpCriticalTable_set_f
4292 */
4293 void saHpiSensorThdUpCriticalTable_set_undo( netsnmp_request_group *rg )
4294 {
4295- netsnmp_variable_list *var;
4296 // saHpiSensorThdUpCriticalTable_context *row_ctx = (saHpiSensorThdUpCriticalTable_context *)rg->existing_row;
4297 // saHpiSensorThdUpCriticalTable_context *undo_ctx = (saHpiSensorThdUpCriticalTable_context *)rg->undo_info;
4298 netsnmp_request_group_item *current;
4299@@ -991,7 +984,6 @@ void saHpiSensorThdUpCriticalTable_set_u
4300 */
4301 for( current = rg->list; current; current = current->next ) {
4302
4303- var = current->ri->requestvb;
4304
4305 switch(current->tri->colnum) {
4306
4307Index: openhpi-subagent-2.3.4/src/saHpiSensorThdUpMajorTable.c
4308===================================================================
4309--- openhpi-subagent-2.3.4.orig/src/saHpiSensorThdUpMajorTable.c
4310+++ openhpi-subagent-2.3.4/src/saHpiSensorThdUpMajorTable.c
4311@@ -776,7 +776,6 @@ void saHpiSensorThdUpMajorTable_set_rese
4312 // saHpiSensorThdUpMajorTable_context *row_ctx = (saHpiSensorThdUpMajorTable_context *)rg->existing_row;
4313 // saHpiSensorThdUpMajorTable_context *undo_ctx = (saHpiSensorThdUpMajorTable_context *)rg->undo_info;
4314 netsnmp_request_group_item *current;
4315- netsnmp_variable_list *var;
4316 int rc;
4317
4318 DEBUGMSGTL ((AGENT, "saHpiSensorThdUpMajorTable_set_reserve2, called\n"));
4319@@ -789,7 +788,6 @@ void saHpiSensorThdUpMajorTable_set_rese
4320 */
4321 for ( current = rg->list; current; current = current->next ) {
4322
4323- var = current->ri->requestvb;
4324 rc = SNMP_ERR_NOERROR;
4325
4326 switch (current->tri->colnum) {
4327@@ -896,7 +894,6 @@ void saHpiSensorThdUpMajorTable_set_acti
4328 */
4329 void saHpiSensorThdUpMajorTable_set_commit( netsnmp_request_group *rg )
4330 {
4331- netsnmp_variable_list *var;
4332 // saHpiSensorThdUpMajorTable_context *row_ctx = (saHpiSensorThdUpMajorTable_context *)rg->existing_row;
4333 // saHpiSensorThdUpMajorTable_context *undo_ctx = (saHpiSensorThdUpMajorTable_context *)rg->undo_info;
4334 netsnmp_request_group_item *current;
4335@@ -908,7 +905,6 @@ void saHpiSensorThdUpMajorTable_set_comm
4336 */
4337 for ( current = rg->list; current; current = current->next ) {
4338
4339- var = current->ri->requestvb;
4340
4341 switch (current->tri->colnum) {
4342
4343@@ -937,7 +933,6 @@ void saHpiSensorThdUpMajorTable_set_comm
4344 */
4345 void saHpiSensorThdUpMajorTable_set_free( netsnmp_request_group *rg )
4346 {
4347- netsnmp_variable_list *var;
4348 // saHpiSensorThdUpMajorTable_context *row_ctx = (saHpiSensorThdUpMajorTable_context *)rg->existing_row;
4349 // saHpiSensorThdUpMajorTable_context *undo_ctx = (saHpiSensorThdUpMajorTable_context *)rg->undo_info;
4350 netsnmp_request_group_item *current;
4351@@ -949,7 +944,6 @@ void saHpiSensorThdUpMajorTable_set_free
4352 */
4353 for ( current = rg->list; current; current = current->next ) {
4354
4355- var = current->ri->requestvb;
4356
4357 switch (current->tri->colnum) {
4358
4359@@ -990,7 +984,6 @@ void saHpiSensorThdUpMajorTable_set_free
4360 */
4361 void saHpiSensorThdUpMajorTable_set_undo( netsnmp_request_group *rg )
4362 {
4363- netsnmp_variable_list *var;
4364 // saHpiSensorThdUpMajorTable_context *row_ctx = (saHpiSensorThdUpMajorTable_context *)rg->existing_row;
4365 // saHpiSensorThdUpMajorTable_context *undo_ctx = (saHpiSensorThdUpMajorTable_context *)rg->undo_info;
4366 netsnmp_request_group_item *current;
4367@@ -1002,7 +995,6 @@ void saHpiSensorThdUpMajorTable_set_undo
4368 */
4369 for ( current = rg->list; current; current = current->next ) {
4370
4371- var = current->ri->requestvb;
4372
4373 switch (current->tri->colnum) {
4374
4375Index: openhpi-subagent-2.3.4/src/saHpiSensorThdUpMinorTable.c
4376===================================================================
4377--- openhpi-subagent-2.3.4.orig/src/saHpiSensorThdUpMinorTable.c
4378+++ openhpi-subagent-2.3.4/src/saHpiSensorThdUpMinorTable.c
4379@@ -765,7 +765,6 @@ void saHpiSensorThdUpMinorTable_set_rese
4380 // saHpiSensorThdUpMinorTable_context *row_ctx = (saHpiSensorThdUpMinorTable_context *)rg->existing_row;
4381 // saHpiSensorThdUpMinorTable_context *undo_ctx = (saHpiSensorThdUpMinorTable_context *)rg->undo_info;
4382 netsnmp_request_group_item *current;
4383- netsnmp_variable_list *var;
4384 int rc;
4385
4386 DEBUGMSGTL ((AGENT, "saHpiSensorThdUpMinorTable_set_reserve2, called\n"));
4387@@ -778,7 +777,6 @@ void saHpiSensorThdUpMinorTable_set_rese
4388 */
4389 for ( current = rg->list; current; current = current->next ) {
4390
4391- var = current->ri->requestvb;
4392 rc = SNMP_ERR_NOERROR;
4393
4394 switch (current->tri->colnum) {
4395@@ -885,7 +883,6 @@ void saHpiSensorThdUpMinorTable_set_acti
4396 */
4397 void saHpiSensorThdUpMinorTable_set_commit( netsnmp_request_group *rg )
4398 {
4399- netsnmp_variable_list *var;
4400 // saHpiSensorThdUpMinorTable_context *row_ctx = (saHpiSensorThdUpMinorTable_context *)rg->existing_row;
4401 // saHpiSensorThdUpMinorTable_context *undo_ctx = (saHpiSensorThdUpMinorTable_context *)rg->undo_info;
4402 netsnmp_request_group_item *current;
4403@@ -897,7 +894,6 @@ void saHpiSensorThdUpMinorTable_set_comm
4404 */
4405 for ( current = rg->list; current; current = current->next ) {
4406
4407- var = current->ri->requestvb;
4408
4409 switch (current->tri->colnum) {
4410
4411@@ -926,7 +922,6 @@ void saHpiSensorThdUpMinorTable_set_comm
4412 */
4413 void saHpiSensorThdUpMinorTable_set_free( netsnmp_request_group *rg )
4414 {
4415- netsnmp_variable_list *var;
4416 // saHpiSensorThdUpMinorTable_context *row_ctx = (saHpiSensorThdUpMinorTable_context *)rg->existing_row;
4417 // saHpiSensorThdUpMinorTable_context *undo_ctx = (saHpiSensorThdUpMinorTable_context *)rg->undo_info;
4418 netsnmp_request_group_item *current;
4419@@ -938,7 +933,6 @@ void saHpiSensorThdUpMinorTable_set_free
4420 */
4421 for ( current = rg->list; current; current = current->next ) {
4422
4423- var = current->ri->requestvb;
4424
4425 switch (current->tri->colnum) {
4426
4427@@ -979,7 +973,6 @@ void saHpiSensorThdUpMinorTable_set_free
4428 */
4429 void saHpiSensorThdUpMinorTable_set_undo( netsnmp_request_group *rg )
4430 {
4431- netsnmp_variable_list *var;
4432 // saHpiSensorThdUpMinorTable_context *row_ctx = (saHpiSensorThdUpMinorTable_context *)rg->existing_row;
4433 // saHpiSensorThdUpMinorTable_context *undo_ctx = (saHpiSensorThdUpMinorTable_context *)rg->undo_info;
4434 netsnmp_request_group_item *current;
4435@@ -991,7 +984,6 @@ void saHpiSensorThdUpMinorTable_set_undo
4436 */
4437 for ( current = rg->list; current; current = current->next ) {
4438
4439- var = current->ri->requestvb;
4440
4441 switch (current->tri->colnum) {
4442
4443Index: openhpi-subagent-2.3.4/src/saHpiSoftwareEventLogTable.c
4444===================================================================
4445--- openhpi-subagent-2.3.4.orig/src/saHpiSoftwareEventLogTable.c
4446+++ openhpi-subagent-2.3.4/src/saHpiSoftwareEventLogTable.c
4447@@ -102,7 +102,6 @@ SaErrorT populate_saHpiSoftwareEventLogT
4448 oid * this_child_oid,
4449 size_t *this_child_oid_len)
4450 {
4451- SaErrorT rv = SA_OK;
4452
4453 oid software_evt_oid[SOFTWARE_EVENT_LOG_INDEX_NR];
4454 netsnmp_index software_evt_idx;
4455@@ -175,7 +174,7 @@ SaErrorT populate_saHpiSoftwareEventLogT
4456
4457 if (!software_evt_ctx) {
4458 snmp_log (LOG_ERR, "Not enough memory for a Software Event Log row!");
4459- rv = AGENT_ERR_INTERNAL_ERROR;
4460+ return AGENT_ERR_INTERNAL_ERROR;
4461 }
4462
4463
4464@@ -235,7 +234,6 @@ SaErrorT software_event_log_clear(SaHpiS
4465 {
4466 oid software_evt_oid[SOFTWARE_EVENT_LOG_INDEX_NR];
4467 netsnmp_index software_evt_idx;
4468- netsnmp_index *software_index;
4469 saHpiSoftwareEventLogTable_context *software_evt_ctx;
4470
4471 DR_XREF *dr_entry;
4472@@ -265,7 +263,7 @@ SaErrorT software_event_log_clear(SaHpiS
4473 /* assign the indices to the index */
4474 software_evt_idx.oids = (oid *) & software_evt_oid;
4475
4476- software_index = CONTAINER_FIRST(cb.container);
4477+ CONTAINER_FIRST(cb.container);
4478 software_evt_ctx = CONTAINER_FIND(cb.container, &software_evt_idx);
4479
4480 if (!software_evt_ctx) {
4481@@ -865,7 +863,6 @@ void saHpiSoftwareEventLogTable_set_rese
4482 // (saHpiSoftwareEventLogTable_context *)rg->existing_row;
4483 // saHpiSoftwareEventLogTable_context *undo_ctx =
4484 // (saHpiSoftwareEventLogTable_context *)rg->undo_info;
4485- netsnmp_variable_list *var;
4486 netsnmp_request_group_item *current;
4487 int rc;
4488
4489@@ -878,7 +875,6 @@ void saHpiSoftwareEventLogTable_set_rese
4490 */
4491 for( current = rg->list; current; current = current->next ) {
4492
4493- var = current->ri->requestvb;
4494 rc = SNMP_ERR_NOERROR;
4495
4496 switch(current->tri->colnum) {
4497@@ -905,7 +901,6 @@ void saHpiSoftwareEventLogTable_set_rese
4498 // saHpiSoftwareEventLogTable_context *row_ctx = (saHpiSoftwareEventLogTable_context *)rg->existing_row;
4499 // saHpiSoftwareEventLogTable_context *undo_ctx = (saHpiSoftwareEventLogTable_context *)rg->undo_info;
4500 netsnmp_request_group_item *current;
4501- netsnmp_variable_list *var;
4502 int rc;
4503
4504 rg->rg_void = rg->list->ri;
4505@@ -916,7 +911,6 @@ void saHpiSoftwareEventLogTable_set_rese
4506 */
4507 for( current = rg->list; current; current = current->next ) {
4508
4509- var = current->ri->requestvb;
4510 rc = SNMP_ERR_NOERROR;
4511
4512 switch(current->tri->colnum) {
4513@@ -948,7 +942,6 @@ void saHpiSoftwareEventLogTable_set_rese
4514 */
4515 void saHpiSoftwareEventLogTable_set_action( netsnmp_request_group *rg )
4516 {
4517- netsnmp_variable_list *var;
4518 // saHpiSoftwareEventLogTable_context *row_ctx = (saHpiSoftwareEventLogTable_context *)rg->existing_row;
4519 // saHpiSoftwareEventLogTable_context *undo_ctx = (saHpiSoftwareEventLogTable_context *)rg->undo_info;
4520 netsnmp_request_group_item *current;
4521@@ -962,7 +955,6 @@ void saHpiSoftwareEventLogTable_set_acti
4522 */
4523 for( current = rg->list; current; current = current->next ) {
4524
4525- var = current->ri->requestvb;
4526
4527 switch(current->tri->colnum) {
4528
4529@@ -1004,7 +996,6 @@ void saHpiSoftwareEventLogTable_set_acti
4530 */
4531 void saHpiSoftwareEventLogTable_set_commit( netsnmp_request_group *rg )
4532 {
4533- netsnmp_variable_list *var;
4534 // saHpiSoftwareEventLogTable_context *row_ctx = (saHpiSoftwareEventLogTable_context *)rg->existing_row;
4535 // saHpiSoftwareEventLogTable_context *undo_ctx = (saHpiSoftwareEventLogTable_context *)rg->undo_info;
4536 netsnmp_request_group_item *current;
4537@@ -1014,7 +1005,6 @@ void saHpiSoftwareEventLogTable_set_comm
4538 */
4539 for( current = rg->list; current; current = current->next ) {
4540
4541- var = current->ri->requestvb;
4542
4543 switch(current->tri->colnum) {
4544
4545@@ -1039,7 +1029,6 @@ void saHpiSoftwareEventLogTable_set_comm
4546 */
4547 void saHpiSoftwareEventLogTable_set_free( netsnmp_request_group *rg )
4548 {
4549- netsnmp_variable_list *var;
4550 // saHpiSoftwareEventLogTable_context *row_ctx = (saHpiSoftwareEventLogTable_context *)rg->existing_row;
4551 // saHpiSoftwareEventLogTable_context *undo_ctx = (saHpiSoftwareEventLogTable_context *)rg->undo_info;
4552 netsnmp_request_group_item *current;
4553@@ -1049,7 +1038,6 @@ void saHpiSoftwareEventLogTable_set_free
4554 */
4555 for( current = rg->list; current; current = current->next ) {
4556
4557- var = current->ri->requestvb;
4558
4559 switch(current->tri->colnum) {
4560
4561@@ -1085,7 +1073,6 @@ void saHpiSoftwareEventLogTable_set_free
4562 */
4563 void saHpiSoftwareEventLogTable_set_undo( netsnmp_request_group *rg )
4564 {
4565- netsnmp_variable_list *var;
4566 // saHpiSoftwareEventLogTable_context *row_ctx = (saHpiSoftwareEventLogTable_context *)rg->existing_row;
4567 // saHpiSoftwareEventLogTable_context *undo_ctx = (saHpiSoftwareEventLogTable_context *)rg->undo_info;
4568 netsnmp_request_group_item *current;
4569@@ -1095,7 +1082,6 @@ void saHpiSoftwareEventLogTable_set_undo
4570 */
4571 for( current = rg->list; current; current = current->next ) {
4572
4573- var = current->ri->requestvb;
4574
4575 switch(current->tri->colnum) {
4576
4577Index: openhpi-subagent-2.3.4/src/saHpiSoftwareEventTable.c
4578===================================================================
4579--- openhpi-subagent-2.3.4.orig/src/saHpiSoftwareEventTable.c
4580+++ openhpi-subagent-2.3.4/src/saHpiSoftwareEventTable.c
4581@@ -103,7 +103,6 @@ SaErrorT populate_saHpiSoftwareEventTabl
4582 oid * this_child_oid,
4583 size_t *this_child_oid_len)
4584 {
4585- SaErrorT rv = SA_OK;
4586 int new_row = MIB_FALSE;
4587
4588 oid software_evt_oid[SOFTWARE_EVENT_INDEX_NR];
4589@@ -161,7 +160,7 @@ SaErrorT populate_saHpiSoftwareEventTabl
4590 }
4591 if (!software_evt_ctx) {
4592 snmp_log (LOG_ERR, "Not enough memory for a Software Event row!");
4593- rv = AGENT_ERR_INTERNAL_ERROR;
4594+ return AGENT_ERR_INTERNAL_ERROR;
4595 }
4596
4597 /** SaHpiEntryId = ASN_UNSIGNED */
4598@@ -222,7 +221,6 @@ SaErrorT async_software_event_add(SaHpiS
4599 oid * this_child_oid,
4600 size_t *this_child_oid_len)
4601 {
4602- SaErrorT rv = SA_OK;
4603 int new_row = MIB_FALSE;
4604
4605 oid software_evt_oid[SOFTWARE_EVENT_INDEX_NR];
4606@@ -289,7 +287,7 @@ SaErrorT async_software_event_add(SaHpiS
4607 }
4608 if (!software_evt_ctx) {
4609 snmp_log (LOG_ERR, "Not enough memory for a Software Event row!");
4610- rv = AGENT_ERR_INTERNAL_ERROR;
4611+ return AGENT_ERR_INTERNAL_ERROR;
4612 }
4613
4614 /** SaHpiEntryId = ASN_UNSIGNED */
4615@@ -897,7 +895,6 @@ void saHpiSoftwareEventTable_set_reserve
4616 // (saHpiSoftwareEventTable_context *)rg->existing_row;
4617 // saHpiSoftwareEventTable_context *undo_ctx =
4618 // (saHpiSoftwareEventTable_context *)rg->undo_info;
4619- netsnmp_variable_list *var;
4620 netsnmp_request_group_item *current;
4621 int rc;
4622
4623@@ -910,7 +907,6 @@ void saHpiSoftwareEventTable_set_reserve
4624 */
4625 for( current = rg->list; current; current = current->next ) {
4626
4627- var = current->ri->requestvb;
4628 rc = SNMP_ERR_NOERROR;
4629
4630 switch(current->tri->colnum) {
4631@@ -937,7 +933,6 @@ void saHpiSoftwareEventTable_set_reserve
4632 // saHpiSoftwareEventTable_context *row_ctx = (saHpiSoftwareEventTable_context *)rg->existing_row;
4633 // saHpiSoftwareEventTable_context *undo_ctx = (saHpiSoftwareEventTable_context *)rg->undo_info;
4634 netsnmp_request_group_item *current;
4635- netsnmp_variable_list *var;
4636 int rc;
4637
4638 rg->rg_void = rg->list->ri;
4639@@ -948,7 +943,6 @@ void saHpiSoftwareEventTable_set_reserve
4640 */
4641 for( current = rg->list; current; current = current->next ) {
4642
4643- var = current->ri->requestvb;
4644 rc = SNMP_ERR_NOERROR;
4645
4646 switch(current->tri->colnum) {
4647@@ -980,7 +974,6 @@ void saHpiSoftwareEventTable_set_reserve
4648 */
4649 void saHpiSoftwareEventTable_set_action( netsnmp_request_group *rg )
4650 {
4651- netsnmp_variable_list *var;
4652 // saHpiSoftwareEventTable_context *row_ctx = (saHpiSoftwareEventTable_context *)rg->existing_row;
4653 // saHpiSoftwareEventTable_context *undo_ctx = (saHpiSoftwareEventTable_context *)rg->undo_info;
4654 netsnmp_request_group_item *current;
4655@@ -994,7 +987,6 @@ void saHpiSoftwareEventTable_set_action(
4656 */
4657 for( current = rg->list; current; current = current->next ) {
4658
4659- var = current->ri->requestvb;
4660
4661 switch(current->tri->colnum) {
4662
4663@@ -1039,7 +1031,6 @@ void saHpiSoftwareEventTable_set_action(
4664 */
4665 void saHpiSoftwareEventTable_set_commit( netsnmp_request_group *rg )
4666 {
4667- netsnmp_variable_list *var;
4668 // saHpiSoftwareEventTable_context *row_ctx = (saHpiSoftwareEventTable_context *)rg->existing_row;
4669 // saHpiSoftwareEventTable_context *undo_ctx = (saHpiSoftwareEventTable_context *)rg->undo_info;
4670 netsnmp_request_group_item *current;
4671@@ -1049,7 +1040,6 @@ void saHpiSoftwareEventTable_set_commit(
4672 */
4673 for( current = rg->list; current; current = current->next ) {
4674
4675- var = current->ri->requestvb;
4676
4677 switch(current->tri->colnum) {
4678
4679@@ -1074,7 +1064,6 @@ void saHpiSoftwareEventTable_set_commit(
4680 */
4681 void saHpiSoftwareEventTable_set_free( netsnmp_request_group *rg )
4682 {
4683- netsnmp_variable_list *var;
4684 // saHpiSoftwareEventTable_context *row_ctx = (saHpiSoftwareEventTable_context *)rg->existing_row;
4685 // saHpiSoftwareEventTable_context *undo_ctx = (saHpiSoftwareEventTable_context *)rg->undo_info;
4686 netsnmp_request_group_item *current;
4687@@ -1084,7 +1073,6 @@ void saHpiSoftwareEventTable_set_free( n
4688 */
4689 for( current = rg->list; current; current = current->next ) {
4690
4691- var = current->ri->requestvb;
4692
4693 switch(current->tri->colnum) {
4694
4695@@ -1120,7 +1108,6 @@ void saHpiSoftwareEventTable_set_free( n
4696 */
4697 void saHpiSoftwareEventTable_set_undo( netsnmp_request_group *rg )
4698 {
4699- netsnmp_variable_list *var;
4700 // saHpiSoftwareEventTable_context *row_ctx = (saHpiSoftwareEventTable_context *)rg->existing_row;
4701 // saHpiSoftwareEventTable_context *undo_ctx = (saHpiSoftwareEventTable_context *)rg->undo_info;
4702 netsnmp_request_group_item *current;
4703@@ -1130,7 +1117,6 @@ void saHpiSoftwareEventTable_set_undo( n
4704 */
4705 for( current = rg->list; current; current = current->next ) {
4706
4707- var = current->ri->requestvb;
4708
4709 switch(current->tri->colnum) {
4710
4711Index: openhpi-subagent-2.3.4/src/saHpiUserEventLogTable.c
4712===================================================================
4713--- openhpi-subagent-2.3.4.orig/src/saHpiUserEventLogTable.c
4714+++ openhpi-subagent-2.3.4/src/saHpiUserEventLogTable.c
4715@@ -104,7 +104,6 @@ SaErrorT populate_saHpiUserEventLogTable
4716 oid * this_child_oid,
4717 size_t *this_child_oid_len)
4718 {
4719- SaErrorT rv = SA_OK;
4720
4721 oid user_evt_oid[USER_EVENT_LOG_INDEX_NR];
4722 netsnmp_index user_evt_idx;
4723@@ -177,7 +176,7 @@ SaErrorT populate_saHpiUserEventLogTable
4724
4725 if (!user_evt_ctx) {
4726 snmp_log (LOG_ERR, "Not enough memory for a User Event Log row!");
4727- rv = AGENT_ERR_INTERNAL_ERROR;
4728+ return AGENT_ERR_INTERNAL_ERROR;
4729 }
4730
4731
4732@@ -231,7 +230,6 @@ SaErrorT user_event_log_clear(SaHpiSessi
4733 {
4734 oid user_evt_oid[USER_EVENT_LOG_INDEX_NR];
4735 netsnmp_index user_evt_idx;
4736- netsnmp_index *user_index;
4737 saHpiUserEventLogTable_context *user_evt_ctx;
4738
4739 DR_XREF *dr_entry;
4740@@ -258,7 +256,7 @@ SaErrorT user_event_log_clear(SaHpiSessi
4741 /* assign the indices to the index */
4742 user_evt_idx.oids = (oid *) & user_evt_oid;
4743
4744- user_index = CONTAINER_FIRST(cb.container);
4745+ CONTAINER_FIRST(cb.container);
4746 user_evt_ctx = CONTAINER_FIND(cb.container, &user_evt_idx);
4747
4748 if (!user_evt_ctx) {
4749@@ -1313,7 +1311,6 @@ void saHpiUserEventLogTable_set_action(
4750 */
4751 void saHpiUserEventLogTable_set_commit( netsnmp_request_group *rg )
4752 {
4753- netsnmp_variable_list *var;
4754 // saHpiUserEventLogTable_context *row_ctx = (saHpiUserEventLogTable_context *)rg->existing_row;
4755 // saHpiUserEventLogTable_context *undo_ctx = (saHpiUserEventLogTable_context *)rg->undo_info;
4756 netsnmp_request_group_item *current;
4757@@ -1323,7 +1320,6 @@ void saHpiUserEventLogTable_set_commit(
4758 */
4759 for( current = rg->list; current; current = current->next ) {
4760
4761- var = current->ri->requestvb;
4762
4763 switch(current->tri->colnum) {
4764
4765@@ -1368,7 +1364,6 @@ void saHpiUserEventLogTable_set_commit(
4766 */
4767 void saHpiUserEventLogTable_set_free( netsnmp_request_group *rg )
4768 {
4769- netsnmp_variable_list *var;
4770 // saHpiUserEventLogTable_context *row_ctx = (saHpiUserEventLogTable_context *)rg->existing_row;
4771 // saHpiUserEventLogTable_context *undo_ctx = (saHpiUserEventLogTable_context *)rg->undo_info;
4772 netsnmp_request_group_item *current;
4773@@ -1378,7 +1373,6 @@ void saHpiUserEventLogTable_set_free( ne
4774 */
4775 for( current = rg->list; current; current = current->next ) {
4776
4777- var = current->ri->requestvb;
4778
4779 switch(current->tri->colnum) {
4780
4781@@ -1434,7 +1428,6 @@ void saHpiUserEventLogTable_set_free( ne
4782 */
4783 void saHpiUserEventLogTable_set_undo( netsnmp_request_group *rg )
4784 {
4785- netsnmp_variable_list *var;
4786 // saHpiUserEventLogTable_context *row_ctx = (saHpiUserEventLogTable_context *)rg->existing_row;
4787 // saHpiUserEventLogTable_context *undo_ctx = (saHpiUserEventLogTable_context *)rg->undo_info;
4788 netsnmp_request_group_item *current;
4789@@ -1444,7 +1437,6 @@ void saHpiUserEventLogTable_set_undo( ne
4790 */
4791 for( current = rg->list; current; current = current->next ) {
4792
4793- var = current->ri->requestvb;
4794
4795 switch(current->tri->colnum) {
4796
4797Index: openhpi-subagent-2.3.4/src/saHpiUserEventTable.c
4798===================================================================
4799--- openhpi-subagent-2.3.4.orig/src/saHpiUserEventTable.c
4800+++ openhpi-subagent-2.3.4/src/saHpiUserEventTable.c
4801@@ -114,7 +114,6 @@ SaErrorT populate_saHpiUserEventTable(Sa
4802 oid * this_child_oid,
4803 size_t *this_child_oid_len)
4804 {
4805- SaErrorT rv = SA_OK;
4806 int new_row = MIB_FALSE;
4807
4808 oid user_evt_oid[USER_EVENT_INDEX_NR];
4809@@ -170,7 +169,7 @@ SaErrorT populate_saHpiUserEventTable(Sa
4810 }
4811 if (!user_evt_ctx) {
4812 snmp_log (LOG_ERR, "Not enough memory for a User Event row!");
4813- rv = AGENT_ERR_INTERNAL_ERROR;
4814+ return AGENT_ERR_INTERNAL_ERROR;
4815 }
4816
4817 /** SaHpiEntryId = ASN_UNSIGNED */
4818@@ -225,7 +224,6 @@ SaErrorT async_user_event_add(SaHpiSessi
4819 oid * this_child_oid,
4820 size_t *this_child_oid_len)
4821 {
4822- SaErrorT rv = SA_OK;
4823 int new_row = MIB_FALSE;
4824
4825 oid user_evt_oid[USER_EVENT_INDEX_NR];
4826@@ -344,7 +342,7 @@ SaErrorT async_user_event_add(SaHpiSessi
4827 if (!user_evt_ctx) {
4828 snmp_log (LOG_ERR,
4829 "async_user_event_add: Not enough memory for a User Event row!");
4830- rv = AGENT_ERR_INTERNAL_ERROR;
4831+ return AGENT_ERR_INTERNAL_ERROR;
4832 }
4833
4834 /* new row fill in everything */
4835@@ -1393,7 +1391,6 @@ void saHpiUserEventTable_set_action( net
4836 */
4837 void saHpiUserEventTable_set_commit( netsnmp_request_group *rg )
4838 {
4839- netsnmp_variable_list *var;
4840 // saHpiUserEventTable_context *row_ctx = (saHpiUserEventTable_context *)rg->existing_row;
4841 // saHpiUserEventTable_context *undo_ctx = (saHpiUserEventTable_context *)rg->undo_info;
4842 netsnmp_request_group_item *current;
4843@@ -1405,7 +1402,6 @@ void saHpiUserEventTable_set_commit( net
4844 */
4845 for( current = rg->list; current; current = current->next ) {
4846
4847- var = current->ri->requestvb;
4848
4849 switch(current->tri->colnum) {
4850
4851@@ -1450,7 +1446,6 @@ void saHpiUserEventTable_set_commit( net
4852 */
4853 void saHpiUserEventTable_set_free( netsnmp_request_group *rg )
4854 {
4855- netsnmp_variable_list *var;
4856 // saHpiUserEventTable_context *row_ctx = (saHpiUserEventTable_context *)rg->existing_row;
4857 // saHpiUserEventTable_context *undo_ctx = (saHpiUserEventTable_context *)rg->undo_info;
4858 netsnmp_request_group_item *current;
4859@@ -1462,7 +1457,6 @@ void saHpiUserEventTable_set_free( netsn
4860 */
4861 for( current = rg->list; current; current = current->next ) {
4862
4863- var = current->ri->requestvb;
4864
4865 switch(current->tri->colnum) {
4866
4867@@ -1518,7 +1512,6 @@ void saHpiUserEventTable_set_free( netsn
4868 */
4869 void saHpiUserEventTable_set_undo( netsnmp_request_group *rg )
4870 {
4871- netsnmp_variable_list *var;
4872 // saHpiUserEventTable_context *row_ctx = (saHpiUserEventTable_context *)rg->existing_row;
4873 // saHpiUserEventTable_context *undo_ctx = (saHpiUserEventTable_context *)rg->undo_info;
4874 netsnmp_request_group_item *current;
4875@@ -1530,7 +1523,6 @@ void saHpiUserEventTable_set_undo( netsn
4876 */
4877 for( current = rg->list; current; current = current->next ) {
4878
4879- var = current->ri->requestvb;
4880
4881 switch(current->tri->colnum) {
4882
4883Index: openhpi-subagent-2.3.4/src/saHpiWatchdogEventLogTable.c
4884===================================================================
4885--- openhpi-subagent-2.3.4.orig/src/saHpiWatchdogEventLogTable.c
4886+++ openhpi-subagent-2.3.4/src/saHpiWatchdogEventLogTable.c
4887@@ -103,7 +103,6 @@ SaErrorT populate_saHpiWatchdogEventLogT
4888 oid * this_child_oid,
4889 size_t *this_child_oid_len)
4890 {
4891- SaErrorT rv = SA_OK;
4892
4893 oid watchdog_evt_oid[WATCHDOG_EVENT_LOG_INDEX_NR];
4894 netsnmp_index watchdog_evt_idx;
4895@@ -178,7 +177,7 @@ SaErrorT populate_saHpiWatchdogEventLogT
4896
4897 if (!watchdog_evt_ctx) {
4898 snmp_log (LOG_ERR, "Not enough memory for a Watchdog Event Log row!");
4899- rv = AGENT_ERR_INTERNAL_ERROR;
4900+ return AGENT_ERR_INTERNAL_ERROR;
4901 }
4902
4903 /** SaHpiTime = ASN_OCTET_STR */
4904@@ -226,7 +225,6 @@ SaErrorT watchdog_event_log_clear(SaHpiS
4905
4906 oid watchdog_evt_oid[WATCHDOG_EVENT_LOG_INDEX_NR];
4907 netsnmp_index watchdog_evt_idx;
4908- netsnmp_index *watchdog_index;
4909 saHpiWatchdogEventLogTable_context *watchdog_evt_ctx;
4910
4911 DR_XREF *dr_entry;
4912@@ -259,7 +257,7 @@ SaErrorT watchdog_event_log_clear(SaHpiS
4913 /* assign the indices to the index */
4914 watchdog_evt_idx.oids = (oid *) & watchdog_evt_oid;
4915
4916- watchdog_index = CONTAINER_FIRST(cb.container);
4917+ CONTAINER_FIRST(cb.container);
4918 watchdog_evt_ctx = CONTAINER_FIND(cb.container, &watchdog_evt_idx);
4919
4920 if (!watchdog_evt_ctx) {
4921@@ -879,7 +877,6 @@ void saHpiWatchdogEventLogTable_set_rese
4922 // (saHpiWatchdogEventLogTable_context *)rg->existing_row;
4923 // saHpiWatchdogEventLogTable_context *undo_ctx =
4924 // (saHpiWatchdogEventLogTable_context *)rg->undo_info;
4925- netsnmp_variable_list *var;
4926 netsnmp_request_group_item *current;
4927 int rc;
4928
4929@@ -892,7 +889,6 @@ void saHpiWatchdogEventLogTable_set_rese
4930 */
4931 for( current = rg->list; current; current = current->next ) {
4932
4933- var = current->ri->requestvb;
4934 rc = SNMP_ERR_NOERROR;
4935
4936 switch(current->tri->colnum) {
4937@@ -919,7 +915,6 @@ void saHpiWatchdogEventLogTable_set_rese
4938 // saHpiWatchdogEventLogTable_context *row_ctx = (saHpiWatchdogEventLogTable_context *)rg->existing_row;
4939 // saHpiWatchdogEventLogTable_context *undo_ctx = (saHpiWatchdogEventLogTable_context *)rg->undo_info;
4940 netsnmp_request_group_item *current;
4941- netsnmp_variable_list *var;
4942 int rc;
4943
4944 rg->rg_void = rg->list->ri;
4945@@ -930,7 +925,6 @@ void saHpiWatchdogEventLogTable_set_rese
4946 */
4947 for( current = rg->list; current; current = current->next ) {
4948
4949- var = current->ri->requestvb;
4950 rc = SNMP_ERR_NOERROR;
4951
4952 switch(current->tri->colnum) {
4953@@ -962,7 +956,6 @@ void saHpiWatchdogEventLogTable_set_rese
4954 */
4955 void saHpiWatchdogEventLogTable_set_action( netsnmp_request_group *rg )
4956 {
4957- netsnmp_variable_list *var;
4958 // saHpiWatchdogEventLogTable_context *row_ctx = (saHpiWatchdogEventLogTable_context *)rg->existing_row;
4959 // saHpiWatchdogEventLogTable_context *undo_ctx = (saHpiWatchdogEventLogTable_context *)rg->undo_info;
4960 netsnmp_request_group_item *current;
4961@@ -976,7 +969,6 @@ void saHpiWatchdogEventLogTable_set_acti
4962 */
4963 for( current = rg->list; current; current = current->next ) {
4964
4965- var = current->ri->requestvb;
4966
4967 switch(current->tri->colnum) {
4968
4969@@ -1017,7 +1009,6 @@ void saHpiWatchdogEventLogTable_set_acti
4970 */
4971 void saHpiWatchdogEventLogTable_set_commit( netsnmp_request_group *rg )
4972 {
4973- netsnmp_variable_list *var;
4974 // saHpiWatchdogEventLogTable_context *row_ctx = (saHpiWatchdogEventLogTable_context *)rg->existing_row;
4975 // saHpiWatchdogEventLogTable_context *undo_ctx = (saHpiWatchdogEventLogTable_context *)rg->undo_info;
4976 netsnmp_request_group_item *current;
4977@@ -1027,7 +1018,6 @@ void saHpiWatchdogEventLogTable_set_comm
4978 */
4979 for( current = rg->list; current; current = current->next ) {
4980
4981- var = current->ri->requestvb;
4982
4983 switch(current->tri->colnum) {
4984
4985@@ -1052,7 +1042,6 @@ void saHpiWatchdogEventLogTable_set_comm
4986 */
4987 void saHpiWatchdogEventLogTable_set_free( netsnmp_request_group *rg )
4988 {
4989- netsnmp_variable_list *var;
4990 // saHpiWatchdogEventLogTable_context *row_ctx = (saHpiWatchdogEventLogTable_context *)rg->existing_row;
4991 // saHpiWatchdogEventLogTable_context *undo_ctx = (saHpiWatchdogEventLogTable_context *)rg->undo_info;
4992 netsnmp_request_group_item *current;
4993@@ -1062,7 +1051,6 @@ void saHpiWatchdogEventLogTable_set_free
4994 */
4995 for( current = rg->list; current; current = current->next ) {
4996
4997- var = current->ri->requestvb;
4998
4999 switch(current->tri->colnum) {
5000
5001@@ -1098,7 +1086,6 @@ void saHpiWatchdogEventLogTable_set_free
5002 */
5003 void saHpiWatchdogEventLogTable_set_undo( netsnmp_request_group *rg )
5004 {
5005- netsnmp_variable_list *var;
5006 // saHpiWatchdogEventLogTable_context *row_ctx = (saHpiWatchdogEventLogTable_context *)rg->existing_row;
5007 // saHpiWatchdogEventLogTable_context *undo_ctx = (saHpiWatchdogEventLogTable_context *)rg->undo_info;
5008 netsnmp_request_group_item *current;
5009@@ -1108,7 +1095,6 @@ void saHpiWatchdogEventLogTable_set_undo
5010 */
5011 for( current = rg->list; current; current = current->next ) {
5012
5013- var = current->ri->requestvb;
5014
5015 switch(current->tri->colnum) {
5016
5017Index: openhpi-subagent-2.3.4/src/saHpiWatchdogEventTable.c
5018===================================================================
5019--- openhpi-subagent-2.3.4.orig/src/saHpiWatchdogEventTable.c
5020+++ openhpi-subagent-2.3.4/src/saHpiWatchdogEventTable.c
5021@@ -104,7 +104,6 @@ SaErrorT populate_saHpiWatchdogEventTabl
5022 oid * this_child_oid,
5023 size_t *this_child_oid_len)
5024 {
5025- SaErrorT rv = SA_OK;
5026 int new_row = MIB_FALSE;
5027
5028 oid watchdog_evt_oid[WATCHDOG_EVENT_INDEX_NR];
5029@@ -165,7 +164,7 @@ SaErrorT populate_saHpiWatchdogEventTabl
5030 }
5031 if (!watchdog_evt_ctx) {
5032 snmp_log (LOG_ERR, "Not enough memory for a Watchdog Event row!");
5033- rv = AGENT_ERR_INTERNAL_ERROR;
5034+ return AGENT_ERR_INTERNAL_ERROR;
5035 }
5036
5037 /** SaHpiEntryId = ASN_UNSIGNED */
5038@@ -215,7 +214,6 @@ SaErrorT async_watchdog_event_add(SaHpiS
5039 oid * this_child_oid,
5040 size_t *this_child_oid_len)
5041 {
5042- SaErrorT rv = SA_OK;
5043 int new_row = MIB_FALSE;
5044
5045 oid watchdog_evt_oid[WATCHDOG_EVENT_INDEX_NR];
5046@@ -284,7 +282,7 @@ SaErrorT async_watchdog_event_add(SaHpiS
5047 }
5048 if (!watchdog_evt_ctx) {
5049 snmp_log (LOG_ERR, "Not enough memory for a Watchdog Event row!");
5050- rv = AGENT_ERR_INTERNAL_ERROR;
5051+ return AGENT_ERR_INTERNAL_ERROR;
5052 }
5053
5054 /** SaHpiEntryId = ASN_UNSIGNED */
5055@@ -907,7 +905,6 @@ void saHpiWatchdogEventTable_set_reserve
5056 // (saHpiWatchdogEventTable_context *)rg->existing_row;
5057 // saHpiWatchdogEventTable_context *undo_ctx =
5058 // (saHpiWatchdogEventTable_context *)rg->undo_info;
5059- netsnmp_variable_list *var;
5060 netsnmp_request_group_item *current;
5061 int rc;
5062
5063@@ -920,7 +917,6 @@ void saHpiWatchdogEventTable_set_reserve
5064 */
5065 for( current = rg->list; current; current = current->next ) {
5066
5067- var = current->ri->requestvb;
5068 rc = SNMP_ERR_NOERROR;
5069
5070 switch(current->tri->colnum) {
5071@@ -947,7 +943,6 @@ void saHpiWatchdogEventTable_set_reserve
5072 // saHpiWatchdogEventTable_context *row_ctx = (saHpiWatchdogEventTable_context *)rg->existing_row;
5073 // saHpiWatchdogEventTable_context *undo_ctx = (saHpiWatchdogEventTable_context *)rg->undo_info;
5074 netsnmp_request_group_item *current;
5075- netsnmp_variable_list *var;
5076 int rc;
5077
5078 rg->rg_void = rg->list->ri;
5079@@ -958,7 +953,6 @@ void saHpiWatchdogEventTable_set_reserve
5080 */
5081 for( current = rg->list; current; current = current->next ) {
5082
5083- var = current->ri->requestvb;
5084 rc = SNMP_ERR_NOERROR;
5085
5086 switch(current->tri->colnum) {
5087@@ -990,7 +984,6 @@ void saHpiWatchdogEventTable_set_reserve
5088 */
5089 void saHpiWatchdogEventTable_set_action( netsnmp_request_group *rg )
5090 {
5091- netsnmp_variable_list *var;
5092 // saHpiWatchdogEventTable_context *row_ctx = (saHpiWatchdogEventTable_context *)rg->existing_row;
5093 // saHpiWatchdogEventTable_context *undo_ctx = (saHpiWatchdogEventTable_context *)rg->undo_info;
5094 netsnmp_request_group_item *current;
5095@@ -1004,7 +997,6 @@ void saHpiWatchdogEventTable_set_action(
5096 */
5097 for( current = rg->list; current; current = current->next ) {
5098
5099- var = current->ri->requestvb;
5100
5101 switch(current->tri->colnum) {
5102
5103@@ -1046,7 +1038,6 @@ void saHpiWatchdogEventTable_set_action(
5104 */
5105 void saHpiWatchdogEventTable_set_commit( netsnmp_request_group *rg )
5106 {
5107- netsnmp_variable_list *var;
5108 // saHpiWatchdogEventTable_context *row_ctx = (saHpiWatchdogEventTable_context *)rg->existing_row;
5109 // saHpiWatchdogEventTable_context *undo_ctx = (saHpiWatchdogEventTable_context *)rg->undo_info;
5110 netsnmp_request_group_item *current;
5111@@ -1056,7 +1047,6 @@ void saHpiWatchdogEventTable_set_commit(
5112 */
5113 for( current = rg->list; current; current = current->next ) {
5114
5115- var = current->ri->requestvb;
5116
5117 switch(current->tri->colnum) {
5118
5119@@ -1081,7 +1071,6 @@ void saHpiWatchdogEventTable_set_commit(
5120 */
5121 void saHpiWatchdogEventTable_set_free( netsnmp_request_group *rg )
5122 {
5123- netsnmp_variable_list *var;
5124 // saHpiWatchdogEventTable_context *row_ctx = (saHpiWatchdogEventTable_context *)rg->existing_row;
5125 // saHpiWatchdogEventTable_context *undo_ctx = (saHpiWatchdogEventTable_context *)rg->undo_info;
5126 netsnmp_request_group_item *current;
5127@@ -1091,7 +1080,6 @@ void saHpiWatchdogEventTable_set_free( n
5128 */
5129 for( current = rg->list; current; current = current->next ) {
5130
5131- var = current->ri->requestvb;
5132
5133 switch(current->tri->colnum) {
5134
5135@@ -1127,7 +1115,6 @@ void saHpiWatchdogEventTable_set_free( n
5136 */
5137 void saHpiWatchdogEventTable_set_undo( netsnmp_request_group *rg )
5138 {
5139- netsnmp_variable_list *var;
5140 // saHpiWatchdogEventTable_context *row_ctx = (saHpiWatchdogEventTable_context *)rg->existing_row;
5141 // saHpiWatchdogEventTable_context *undo_ctx = (saHpiWatchdogEventTable_context *)rg->undo_info;
5142 netsnmp_request_group_item *current;
5143@@ -1137,7 +1124,6 @@ void saHpiWatchdogEventTable_set_undo( n
5144 */
5145 for( current = rg->list; current; current = current->next ) {
5146
5147- var = current->ri->requestvb;
5148
5149 switch(current->tri->colnum) {
5150
5151Index: openhpi-subagent-2.3.4/src/saHpiWatchdogTable.c
5152===================================================================
5153--- openhpi-subagent-2.3.4.orig/src/saHpiWatchdogTable.c
5154+++ openhpi-subagent-2.3.4/src/saHpiWatchdogTable.c
5155@@ -1200,7 +1200,6 @@ void saHpiWatchdogTable_set_reserve2( ne
5156 // saHpiWatchdogTable_context *row_ctx = (saHpiWatchdogTable_context *)rg->existing_row;
5157 // saHpiWatchdogTable_context *undo_ctx = (saHpiWatchdogTable_context *)rg->undo_info;
5158 netsnmp_request_group_item *current;
5159- netsnmp_variable_list *var;
5160 int rc;
5161
5162 rg->rg_void = rg->list->ri;
5163@@ -1211,7 +1210,6 @@ void saHpiWatchdogTable_set_reserve2( ne
5164 */
5165 for( current = rg->list; current; current = current->next ) {
5166
5167- var = current->ri->requestvb;
5168 rc = SNMP_ERR_NOERROR;
5169
5170 switch(current->tri->colnum) {
5171@@ -1469,7 +1467,6 @@ void saHpiWatchdogTable_set_action( nets
5172 */
5173 void saHpiWatchdogTable_set_commit( netsnmp_request_group *rg )
5174 {
5175- netsnmp_variable_list *var;
5176 // saHpiWatchdogTable_context *row_ctx = (saHpiWatchdogTable_context *)rg->existing_row;
5177 // saHpiWatchdogTable_context *undo_ctx = (saHpiWatchdogTable_context *)rg->undo_info;
5178 netsnmp_request_group_item *current;
5179@@ -1479,7 +1476,6 @@ void saHpiWatchdogTable_set_commit( nets
5180 */
5181 for( current = rg->list; current; current = current->next ) {
5182
5183- var = current->ri->requestvb;
5184
5185 switch(current->tri->colnum) {
5186
5187@@ -1544,7 +1540,6 @@ void saHpiWatchdogTable_set_commit( nets
5188 */
5189 void saHpiWatchdogTable_set_free( netsnmp_request_group *rg )
5190 {
5191- netsnmp_variable_list *var;
5192 // saHpiWatchdogTable_context *row_ctx = (saHpiWatchdogTable_context *)rg->existing_row;
5193 // saHpiWatchdogTable_context *undo_ctx = (saHpiWatchdogTable_context *)rg->undo_info;
5194 netsnmp_request_group_item *current;
5195@@ -1554,7 +1549,6 @@ void saHpiWatchdogTable_set_free( netsnm
5196 */
5197 for( current = rg->list; current; current = current->next ) {
5198
5199- var = current->ri->requestvb;
5200
5201 switch(current->tri->colnum) {
5202
5203@@ -1631,7 +1625,6 @@ void saHpiWatchdogTable_set_free( netsnm
5204 */
5205 void saHpiWatchdogTable_set_undo( netsnmp_request_group *rg )
5206 {
5207- netsnmp_variable_list *var;
5208 // saHpiWatchdogTable_context *row_ctx = (saHpiWatchdogTable_context *)rg->existing_row;
5209 // saHpiWatchdogTable_context *undo_ctx = (saHpiWatchdogTable_context *)rg->undo_info;
5210 netsnmp_request_group_item *current;
5211@@ -1641,7 +1634,6 @@ void saHpiWatchdogTable_set_undo( netsnm
5212 */
5213 for( current = rg->list; current; current = current->next ) {
5214
5215- var = current->ri->requestvb;
5216
5217 switch(current->tri->colnum) {
5218
diff --git a/recipes-extended/openhpi-subagent/files/openhpi-subagent-2.3.4-format.patch b/recipes-extended/openhpi-subagent/files/openhpi-subagent-2.3.4-format.patch
new file mode 100644
index 0000000..7a9306e
--- /dev/null
+++ b/recipes-extended/openhpi-subagent/files/openhpi-subagent-2.3.4-format.patch
@@ -0,0 +1,193 @@
1diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiAnnouncementTable.c openhpi-subagent-2.3.4/src/saHpiAnnouncementTable.c
2--- openhpi-subagent-2.3.4.orig/src/saHpiAnnouncementTable.c 2006-09-13 17:41:26.000000000 +0200
3+++ openhpi-subagent-2.3.4/src/saHpiAnnouncementTable.c 2009-10-26 11:04:01.000000000 +0100
4@@ -429,7 +429,7 @@ int announcement_add (saHpiAnnouncementT
5 if (rc != SA_OK) {
6 DEBUGMSGTL ((AGENT,
7 "announcement_add: oh_encode_entitypath Failed:"
8- " rc = %d\n",
9+ " rc = %s\n",
10 oh_lookup_error(rc)));
11 }
12
13@@ -450,7 +450,7 @@ int announcement_add (saHpiAnnouncementT
14 if (rc != SA_OK) {
15 DEBUGMSGTL ((AGENT,
16 "announcement_add: oh_encode_eventstate Failed:"
17- " rc = %d\n",
18+ " rc = %s\n",
19 oh_lookup_error(rc)));
20 }
21 }
22diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiAreaTable.c openhpi-subagent-2.3.4/src/saHpiAreaTable.c
23--- openhpi-subagent-2.3.4.orig/src/saHpiAreaTable.c 2006-09-13 17:41:26.000000000 +0200
24+++ openhpi-subagent-2.3.4/src/saHpiAreaTable.c 2009-10-26 11:04:01.000000000 +0100
25@@ -1111,7 +1111,7 @@ void saHpiAreaTable_set_reserve1( netsnm
26 dri_entry->entry_id++;
27 } else {
28 DEBUGMSGTL ((AGENT,"dri_entry->entry_id [%d]\n", dri_entry->entry_id));
29- DEBUGMSGTL ((AGENT,"row_ctx->index.oids[saHpiAreaId_INDEX] [%d]\n", row_ctx->index.oids[saHpiAreaId_INDEX]));
30+ DEBUGMSGTL ((AGENT,"row_ctx->index.oids[saHpiAreaId_INDEX] [%ld]\n", row_ctx->index.oids[saHpiAreaId_INDEX]));
31 DEBUGMSGTL ((AGENT,
32 "ERROR: saHpiAreaTable_set_reserve1() User specified AreaId invalid!!!\n"));
33 rc = SNMP_ERR_WRONGVALUE;
34diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiAutoInsertTimeoutTable.c openhpi-subagent-2.3.4/src/saHpiAutoInsertTimeoutTable.c
35--- openhpi-subagent-2.3.4.orig/src/saHpiAutoInsertTimeoutTable.c 2006-09-13 17:41:26.000000000 +0200
36+++ openhpi-subagent-2.3.4/src/saHpiAutoInsertTimeoutTable.c 2009-10-26 11:04:01.000000000 +0100
37@@ -587,7 +587,7 @@ void saHpiAutoInsertTimeoutTable_set_res
38 rc = SNMP_ERR_WRONGLENGTH;
39 DEBUGMSGTL ((AGENT,
40 "COLUMN_SAHPIAUTOINSERTTIMEOUTFORINSERT"
41- " SNMP_ERR_WRONGLENGTH\n", rc));
42+ " SNMP_ERR_WRONGLENGTH\n"));
43 }
44 }
45 break;
46diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiDomainInfoTable.c openhpi-subagent-2.3.4/src/saHpiDomainInfoTable.c
47--- openhpi-subagent-2.3.4.orig/src/saHpiDomainInfoTable.c 2006-09-13 17:41:26.000000000 +0200
48+++ openhpi-subagent-2.3.4/src/saHpiDomainInfoTable.c 2009-10-26 11:04:01.000000000 +0100
49@@ -350,7 +350,7 @@ int handle_saHpiDomainInfoActiveEntries(
50 netsnmp_agent_request_info *reqinfo,
51 netsnmp_request_info *requests)
52 {
53- DEBUGMSGTL ((AGENT, "handle_saHpiDomainInfoActiveEntries: Entry Count is %d\n",
54+ DEBUGMSGTL ((AGENT, "handle_saHpiDomainInfoActiveEntries: Entry Count is %ld\n",
55 domain_info_entry_count));
56
57 /* We are never called for a GETNEXT if it's registered as a
58diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiDomainReferenceTable.c openhpi-subagent-2.3.4/src/saHpiDomainReferenceTable.c
59--- openhpi-subagent-2.3.4.orig/src/saHpiDomainReferenceTable.c 2006-09-13 17:41:26.000000000 +0200
60+++ openhpi-subagent-2.3.4/src/saHpiDomainReferenceTable.c 2009-10-26 11:04:01.000000000 +0100
61@@ -220,7 +220,7 @@ handle_saHpiDomainReferenceActiveEntries
62 netsnmp_request_info *requests)
63 {
64 DEBUGMSGTL ((AGENT,
65- "handle_saHpiDomainReferenceActiveEntries: Entry Count is %d\n",
66+ "handle_saHpiDomainReferenceActiveEntries: Entry Count is %ld\n",
67 domain_reference_entry_count));
68
69 domain_reference_entry_count = CONTAINER_SIZE (cb.container);
70diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiEventLogInfoTable.c openhpi-subagent-2.3.4/src/saHpiEventLogInfoTable.c
71--- openhpi-subagent-2.3.4.orig/src/saHpiEventLogInfoTable.c 2006-09-13 17:41:26.000000000 +0200
72+++ openhpi-subagent-2.3.4/src/saHpiEventLogInfoTable.c 2009-10-26 11:04:01.000000000 +0100
73@@ -1184,7 +1184,7 @@ void saHpiEventLogInfoTable_set_reserve1
74 rc = SNMP_ERR_WRONGLENGTH;
75 DEBUGMSGTL ((AGENT,
76 "COLUMN_SAHPIEVENTLOGINFOTIME"
77- " SNMP_ERR_WRONGLENGTH\n", rc));
78+ " SNMP_ERR_WRONGLENGTH\n"));
79 }
80 }
81
82diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiFieldTable.c openhpi-subagent-2.3.4/src/saHpiFieldTable.c
83--- openhpi-subagent-2.3.4.orig/src/saHpiFieldTable.c 2006-09-13 17:41:26.000000000 +0200
84+++ openhpi-subagent-2.3.4/src/saHpiFieldTable.c 2009-10-26 11:04:01.000000000 +0100
85@@ -1409,7 +1409,7 @@ void saHpiFieldTable_set_reserve1( netsn
86 } else {
87 DEBUGMSGTL ((AGENT,"***********************************************\n"));
88 DEBUGMSGTL ((AGENT,"dria_entry->entry_id [%d]\n", dria_entry->entry_id));
89- DEBUGMSGTL ((AGENT,"row_ctx->index.oids[saHpiFieldId_INDEX] [%d]\n",
90+ DEBUGMSGTL ((AGENT,"row_ctx->index.oids[saHpiFieldId_INDEX] [%ld]\n",
91 row_ctx->index.oids[saHpiFieldId_field_INDEX]));
92 DEBUGMSGTL ((AGENT,
93 "ERROR: saHpiFieldTable_set_reserve1() User specified FieldId invalid!!!\n"));
94diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiHotSwapTable.c openhpi-subagent-2.3.4/src/saHpiHotSwapTable.c
95--- openhpi-subagent-2.3.4.orig/src/saHpiHotSwapTable.c 2006-09-13 17:41:26.000000000 +0200
96+++ openhpi-subagent-2.3.4/src/saHpiHotSwapTable.c 2009-10-26 11:04:01.000000000 +0100
97@@ -997,7 +997,7 @@ void saHpiHotSwapTable_set_reserve1( net
98 rc = SNMP_ERR_WRONGLENGTH;
99 DEBUGMSGTL ((AGENT,
100 "COLUMN_SAHPIHOTSWAPEXTRACTTIMEOUT"
101- " SNMP_ERR_WRONGLENGTH\n", rc));
102+ " SNMP_ERR_WRONGLENGTH\n"));
103 }
104 }
105 break;
106diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiRdrTable.c openhpi-subagent-2.3.4/src/saHpiRdrTable.c
107--- openhpi-subagent-2.3.4.orig/src/saHpiRdrTable.c 2006-09-13 17:41:26.000000000 +0200
108+++ openhpi-subagent-2.3.4/src/saHpiRdrTable.c 2009-10-26 11:04:01.000000000 +0100
109@@ -492,7 +492,7 @@ int populate_saHpiRdrTable(SaHpiSessionI
110
111 rdr_entry_count = CONTAINER_SIZE (cb.container);
112
113- DEBUGMSGTL ((AGENT, "populate_saHpiRdrTable: rdr_entry_count = %d\n", rdr_entry_count));
114+ DEBUGMSGTL ((AGENT, "populate_saHpiRdrTable: rdr_entry_count = %ld\n", rdr_entry_count));
115
116
117 subagent_unlock(&hpi_lock_data);
118@@ -528,8 +528,8 @@ SaErrorT clear_rdr_container(SaHpiDomain
119 do {
120 rdr_ctx = CONTAINER_FIND(cb.container, row_idx);
121
122- DEBUGMSGTL ((AGENT, "CONTAINER_FIND: rdr_ctx: [%d] row_idx: [%d]"
123- " counter [%d], rdr_entry_count [%d]\n",
124+ DEBUGMSGTL ((AGENT, "CONTAINER_FIND: rdr_ctx: [%p] row_idx: [%p]"
125+ " counter [%d], rdr_entry_count [%ld]\n",
126 rdr_ctx, row_idx, counter++, rdr_entry_count));
127
128 row_idx = CONTAINER_NEXT(cb.container, row_idx);
129diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiResourceTable.c openhpi-subagent-2.3.4/src/saHpiResourceTable.c
130--- openhpi-subagent-2.3.4.orig/src/saHpiResourceTable.c 2006-09-13 17:41:26.000000000 +0200
131+++ openhpi-subagent-2.3.4/src/saHpiResourceTable.c 2009-10-26 11:04:07.000000000 +0100
132@@ -254,8 +254,8 @@ int populate_saHpiResourceTable(SaHpiSes
133
134 DEBUGMSGTL ((AGENT, "populate_saHpiResourceTable RptEntry.ResourceTag.DataLength rv = %d\n",
135 RptEntry.ResourceTag.DataLength));
136- DEBUGMSGTL ((AGENT, "populate_saHpiResourceTable strlen(RptEntry.ResourceTag.Data) rv = %d\n",
137- strlen((const char *)RptEntry.ResourceTag.Data)));
138+ DEBUGMSGTL ((AGENT, "populate_saHpiResourceTable strlen(RptEntry.ResourceTag.Data) rv = %ld\n",
139+ (long)strlen((const char *)RptEntry.ResourceTag.Data)));
140
141
142 /** INTEGER = ASN_INTEGER */
143@@ -322,7 +322,7 @@ int populate_saHpiResourceTable(SaHpiSes
144
145 resource_entry_count = CONTAINER_SIZE (cb.container);
146
147- DEBUGMSGTL ((AGENT, "resource_entry_count = %d\n", resource_entry_count));
148+ DEBUGMSGTL ((AGENT, "resource_entry_count = %ld\n", resource_entry_count));
149
150 subagent_unlock(&hpi_lock_data);
151
152@@ -630,7 +630,7 @@ DEBUGMSGTL ((AGENT, "**** MIB_FALSE [%d]
153 resource_entry_count = CONTAINER_SIZE (cb.container);
154
155
156- DEBUGMSGTL ((AGENT, "async_event_resource: resource_entry_count = %d\n",
157+ DEBUGMSGTL ((AGENT, "async_event_resource: resource_entry_count = %ld\n",
158 resource_entry_count));
159
160 return rv;
161@@ -828,7 +828,7 @@ int handle_saHpiResourceActiveEntries(ne
162 {
163
164 DEBUGMSGTL ((AGENT,
165- "handle_saHpiResourceActiveEntries: Entry Count is %d\n",
166+ "handle_saHpiResourceActiveEntries: Entry Count is %ld\n",
167 resource_entry_count));
168
169 /* We are never called for a GETNEXT if it's registered as a
170diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiUserEventLogTable.c openhpi-subagent-2.3.4/src/saHpiUserEventLogTable.c
171--- openhpi-subagent-2.3.4.orig/src/saHpiUserEventLogTable.c 2006-09-13 17:41:26.000000000 +0200
172+++ openhpi-subagent-2.3.4/src/saHpiUserEventLogTable.c 2009-10-26 11:04:01.000000000 +0100
173@@ -1076,7 +1076,7 @@ void saHpiUserEventLogTable_set_reserve1
174 } else {
175 DEBUGMSGTL ((AGENT,"***********************************************\n"));
176 DEBUGMSGTL ((AGENT,"dr_entry->entry_id [%d]\n", dr_entry->entry_id));
177- DEBUGMSGTL ((AGENT,"row_ctx->index.oids[saHpiUserEventEntryId_event_log_INDEX] [%d]\n",
178+ DEBUGMSGTL ((AGENT,"row_ctx->index.oids[saHpiUserEventEntryId_event_log_INDEX] [%ld]\n",
179 row_ctx->index.oids[saHpiUserEventEntryId_event_log_INDEX]));
180 DEBUGMSGTL ((AGENT,
181 "ERROR: saHpiUserEventLogTable_set_reserve1() "
182diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiUserEventTable.c openhpi-subagent-2.3.4/src/saHpiUserEventTable.c
183--- openhpi-subagent-2.3.4.orig/src/saHpiUserEventTable.c 2006-09-13 17:41:26.000000000 +0200
184+++ openhpi-subagent-2.3.4/src/saHpiUserEventTable.c 2009-10-26 11:04:01.000000000 +0100
185@@ -1158,7 +1158,7 @@ void saHpiUserEventTable_set_reserve1( n
186 } else {
187 DEBUGMSGTL ((AGENT,"***********************************************\n"));
188 DEBUGMSGTL ((AGENT,"dr_entry->entry_id [%d]\n", dr_entry->entry_id));
189- DEBUGMSGTL ((AGENT,"row_ctx->index.oids[saHpiUserEventEntryId_event_INDEX] [%d]\n",
190+ DEBUGMSGTL ((AGENT,"row_ctx->index.oids[saHpiUserEventEntryId_event_INDEX] [%ld]\n",
191 row_ctx->index.oids[saHpiUserEventEntryId_event_INDEX]));
192 DEBUGMSGTL ((AGENT,
193 "ERROR: saHpiUserEventTable_set_reserve1() User specified UserEventEntryId invalid!!!\n"));
diff --git a/recipes-extended/openhpi-subagent/files/remove_unused_but_set_variable.patch b/recipes-extended/openhpi-subagent/files/remove_unused_but_set_variable.patch
new file mode 100644
index 0000000..b2c89b4
--- /dev/null
+++ b/recipes-extended/openhpi-subagent/files/remove_unused_but_set_variable.patch
@@ -0,0 +1,20 @@
1Index: openhpi-subagent-2.3.4/src/hpiSubagent.c
2===================================================================
3--- openhpi-subagent-2.3.4.orig/src/hpiSubagent.c
4+++ openhpi-subagent-2.3.4/src/hpiSubagent.c
5@@ -219,7 +219,6 @@ main (int argc, char **argv)
6 SaHpiVersionT hpiVer;
7 SaHpiSessionIdT sessionid;
8 SaHpiDomainInfoT domain_info;
9- SaHpiBoolT run_threaded = TRUE;
10
11 pid_t child;
12
13@@ -479,7 +478,6 @@ main (int argc, char **argv)
14 env = getenv("OPENHPI_THREADED");
15 if ((env == (char *)NULL) || (strcmp(env, "NO") == 0)) {
16 DEBUGMSGTL ((AGENT, "Running in nonthreaded mode. Configuring polling mechanism\n"));
17- run_threaded = SAHPI_FALSE;
18 set_run_threaded(FALSE);
19 if (init_alarm() != AGENT_ERR_NOERROR) {
20 snmp_log (LOG_ERR, "Could not initialize polling mechanism. Exiting\n.");
diff --git a/recipes-extended/openhpi-subagent/openhpi-subagent.inc b/recipes-extended/openhpi-subagent/openhpi-subagent.inc
new file mode 100644
index 0000000..9fd5623
--- /dev/null
+++ b/recipes-extended/openhpi-subagent/openhpi-subagent.inc
@@ -0,0 +1,13 @@
1DESCRIPTION = "The openhpi-subagent package contains the Service Availability Forum's Hardware Platform Interface SNMP sub-agent."
2SECTION = "console/network"
3LICENSE = "BSD"
4LIC_FILES_CHKSUM = "file://COPYING;md5=fc94392823a2f9536e4ca1dc82381bc1"
5DEPENDS = "openssl zlib openhpi net-snmp"
6
7INC_PR = "r0"
8
9inherit pkgconfig autotools gettext
10
11EXTRA_OECONF = "--with-net-snmp-config=${STAGING_BINDIR}/net-snmp-config"
12
13FILES_${PN} += "${datadir}/snmp/*"
diff --git a/recipes-extended/openhpi-subagent/openhpi-subagent_2.3.4.bb b/recipes-extended/openhpi-subagent/openhpi-subagent_2.3.4.bb
new file mode 100644
index 0000000..5b44fdf
--- /dev/null
+++ b/recipes-extended/openhpi-subagent/openhpi-subagent_2.3.4.bb
@@ -0,0 +1,15 @@
1PR = "${INC_PR}.0"
2
3SRC_URI = "${SOURCEFORGE_MIRROR}/openhpi/openhpi-subagent-${PV}.tar.gz \
4 file://fix_autoconf.patch \
5 file://openhpi-subagent-2.3.4-format.patch \
6 file://remove_unused_but_set_variable.patch \
7 file://glib.patch \
8 file://glib_mutex.patch \
9 file://netsnmp_unused.patch \
10 file://configure_pkgconfig_openhpiutils.patch \
11 "
12SRC_URI[md5sum] = "17e84d43ef1d24ae8caa52615efb9512"
13SRC_URI[sha256sum] = "76ed0a84fdf6952341e90fc1588c2bc38021d742a65eefab92e82fd40099639a"
14
15require openhpi-subagent.inc
diff --git a/recipes-extended/openhpi/files/configure_fix.patch b/recipes-extended/openhpi/files/configure_fix.patch
new file mode 100644
index 0000000..d6c9818
--- /dev/null
+++ b/recipes-extended/openhpi/files/configure_fix.patch
@@ -0,0 +1,18 @@
1--- a/configure.ac 2012-08-27 15:08:58.000000000 -0300
2+++ b/configure.ac 2013-07-31 08:55:00.017653886 -0300
3@@ -277,6 +277,7 @@
4 if test "x$have_sysfs" = "xyes"; then
5 AC_SUBST(SYSFS,sysfs)
6 AC_SUBST(WITH_SYSFS,1)
7+ AC_CHECK_HEADERS([sysfs/libsysfs.h])
8 else
9 OH_CHECK_FAIL(libsysfs,,http://linux-diag.sf.net,
10 Can not build sysfs support without libsysfs)
11@@ -287,6 +288,7 @@
12 [if test "x$have_sysfs" = "xyes"; then
13 AC_SUBST(SYSFS,sysfs)
14 AC_SUBST(WITH_SYSFS,1)
15+ AC_SUBST(SYSFS_INCLUDE)
16 else
17 AC_SUBST(WITH_SYSFS,0)
18 fi
diff --git a/recipes-extended/openhpi/files/my_changes.patch b/recipes-extended/openhpi/files/my_changes.patch
new file mode 100644
index 0000000..feb777b
--- /dev/null
+++ b/recipes-extended/openhpi/files/my_changes.patch
@@ -0,0 +1,26 @@
1Index: openhpi-3.2.1/plugins/sysfs/Makefile.am
2===================================================================
3--- openhpi-3.2.1.orig/plugins/sysfs/Makefile.am
4+++ openhpi-3.2.1/plugins/sysfs/Makefile.am
5@@ -33,7 +33,7 @@ MAINTAINERCLEANFILES = Makefile.in
6
7 AM_CPPFLAGS = -DG_LOG_DOMAIN=\"sysfs\"
8
9-INCLUDES = @OPENHPI_INCLUDES@ -I/usr/include/sysfs
10+INCLUDES = @OPENHPI_INCLUDES@
11
12 pkglib_LTLIBRARIES = libsysfs2hpi.la
13
14Index: openhpi-3.2.1/plugins/sysfs/sysfs2hpi.c
15===================================================================
16--- openhpi-3.2.1.orig/plugins/sysfs/sysfs2hpi.c
17+++ openhpi-3.2.1/plugins/sysfs/sysfs2hpi.c
18@@ -18,7 +18,7 @@
19
20 #include <stdlib.h>
21 #include <string.h>
22-#include <libsysfs.h>
23+#include <sysfs/libsysfs.h>
24
25 #include <SaHpi.h>
26 #include <oh_utils.h>
diff --git a/recipes-extended/openhpi/files/my_xml.patch b/recipes-extended/openhpi/files/my_xml.patch
new file mode 100644
index 0000000..4d9aa15
--- /dev/null
+++ b/recipes-extended/openhpi/files/my_xml.patch
@@ -0,0 +1,15 @@
1Index: openhpi-3.2.1/plugins/ilo2_ribcl/ilo2_ribcl_xml.c
2===================================================================
3--- openhpi-3.2.1.orig/plugins/ilo2_ribcl/ilo2_ribcl_xml.c
4+++ openhpi-3.2.1/plugins/ilo2_ribcl/ilo2_ribcl_xml.c
5@@ -44,8 +44,8 @@
6 #include <ctype.h>
7 #include <errno.h>
8 #include <sys/types.h>
9-#include <libxml/parser.h>
10-#include <libxml/xmlmemory.h>
11+#include <libxml2/libxml/parser.h>
12+#include <libxml2/libxml/xmlmemory.h>
13 #include <ilo2_ribcl.h>
14 #include <ilo2_ribcl_xml.h>
15 #include <ilo2_ribcl_cmnds.h>
diff --git a/recipes-extended/openhpi/files/openhpi_openclovis.patch b/recipes-extended/openhpi/files/openhpi_openclovis.patch
new file mode 100644
index 0000000..5e51bb4
--- /dev/null
+++ b/recipes-extended/openhpi/files/openhpi_openclovis.patch
@@ -0,0 +1,237 @@
1diff -Naur openhpi-3.0.0/plugins/dynamic_simulator/new_sim_file_util.cpp openhpi-3.0.0.oc/plugins/dynamic_simulator/new_sim_file_util.cpp
2--- openhpi-3.0.0/plugins/dynamic_simulator/new_sim_file_util.cpp 2011-10-17 13:57:23.000000000 -0200
3+++ openhpi-3.0.0.oc/plugins/dynamic_simulator/new_sim_file_util.cpp 2012-01-10 14:16:29.000000000 -0200
4@@ -118,7 +118,7 @@
5 } else if (cur_token == G_TOKEN_STRING) {
6 datafield = g_strdup(m_scanner->value.v_string);
7 } else {
8- err("Processing parse textbuffer: unknow value type %u", cur_token);
9+ err("Processing parse textbuffer: unknown value type %u", cur_token);
10 success = false;
11 break;
12 }
13@@ -129,7 +129,7 @@
14 tmp.Language = ( SaHpiLanguageT ) val;
15 } else if (!strcmp( "DataLength", field )) {
16 tmp.DataLength = val;
17- } else if (!strcmp( "Data", field )) {
18+ } else if ((!strcmp( "Data", field ))&&datafield) {
19 strncpy ((char *) tmp.Data, datafield, SAHPI_MAX_TEXT_BUFFER_LENGTH);
20 } else {
21 err("Processing parse textbuffer: unknown field %s", field);
22diff -Naur openhpi-3.0.0/plugins/dynamic_simulator/new_sim_sensor_threshold.cpp openhpi-3.0.0.oc/plugins/dynamic_simulator/new_sim_sensor_threshold.cpp
23--- openhpi-3.0.0/plugins/dynamic_simulator/new_sim_sensor_threshold.cpp 2011-10-17 13:57:23.000000000 -0200
24+++ openhpi-3.0.0.oc/plugins/dynamic_simulator/new_sim_sensor_threshold.cpp 2012-01-10 14:16:25.000000000 -0200
25@@ -478,7 +478,10 @@
26 rv = checkOrdering( tmp );
27 if ( rv != SA_OK )
28 return rv;
29-
30+
31+ // Now check if the threshold changes caused an event
32+ CheckThresholdsAndPublishEvents(&tmp);
33+
34 // Ok, it seems everything is fine - take the new values
35 memcpy( &m_thres, &tmp, sizeof(SaHpiSensorThresholdsT));
36
37@@ -486,6 +489,183 @@
38 }
39
40
41+void NewSimulatorSensorThreshold::CreateThresholdEvent(SaHpiEventStateT theActualEvent, SaHpiBoolT asserted)
42+{
43+ NewSimulatorResource *res = Resource();
44+ if( !res )
45+ {
46+ stdlog << "CreateEnableChangeEvent: No resource !\n";
47+ return;
48+ }
49+
50+ oh_event *e = (oh_event *)g_malloc0( sizeof( struct oh_event ) );
51+
52+ e->event.EventType = SAHPI_ET_SENSOR_ENABLE_CHANGE;
53+
54+ SaHpiRptEntryT *rptentry = oh_get_resource_by_id( res->Domain()->GetHandler()->rptcache, res->ResourceId() );
55+ SaHpiRdrT *rdrentry = oh_get_rdr_by_id( res->Domain()->GetHandler()->rptcache, res->ResourceId(), m_record_id );
56+
57+ if ( rptentry )
58+ e->resource = *rptentry;
59+ else
60+ e->resource.ResourceCapabilities = 0;
61+
62+ if ( rdrentry )
63+ e->rdrs = g_slist_append(e->rdrs, g_memdup(rdrentry, sizeof(SaHpiRdrT)));
64+ else
65+ e->rdrs = NULL;
66+
67+ // Fill the event data
68+ e->event.Source = res->ResourceId();
69+ e->event.EventType = SAHPI_ET_SENSOR;
70+
71+ if ((theActualEvent & SAHPI_ES_LOWER_MINOR) || (theActualEvent & SAHPI_ES_UPPER_MINOR))
72+ e->event.Severity = SAHPI_MINOR;
73+ if ((theActualEvent & SAHPI_ES_LOWER_MAJOR) || (theActualEvent & SAHPI_ES_UPPER_MAJOR))
74+ e->event.Severity = SAHPI_MAJOR;
75+ if ((theActualEvent & SAHPI_ES_LOWER_CRIT) || (theActualEvent & SAHPI_ES_UPPER_CRIT))
76+ e->event.Severity = SAHPI_CRITICAL;
77+
78+ oh_gettimeofday(&e->event.Timestamp);
79+
80+ // sensor enable event
81+ SaHpiSensorEventT *se = &e->event.EventDataUnion.SensorEvent;
82+ se->SensorNum = m_sensor_record.Num;
83+ se->SensorType = Type();
84+ se->EventCategory = SAHPI_EC_THRESHOLD;
85+ se->Assertion = asserted; // True if the condition is being raised, False if cleared
86+
87+ se->EventState = theActualEvent;
88+ se->OptionalDataPresent = 0;
89+
90+ // Issue the event
91+ stdlog << "NewSimulatorSensorThreshold::CreateThresholdEvent OH_ET_HPI Event threshold resource " << res-> ResourceId() << "\n";
92+ res->Domain()->AddHpiEvent( e );
93+
94+}
95+
96+
97+SaErrorT NewSimulatorSensorThreshold::CheckThresholdsAndPublishEvents(const SaHpiSensorThresholdsT* thres)
98+{
99+ // Only generate if the threshold is supported.
100+ if (thres->UpMinor.IsSupported) {
101+ // Crossing the threshold in both directions (from deasserted to asserted,
102+ // and from asserted to deasserted) needs to be handled.
103+
104+ if (m_event_data & SAHPI_ES_UPPER_MINOR) {
105+ // See if the threshold is no longer exceeded
106+ if (lt(m_read_data,thres->UpMinor)) {
107+ CreateThresholdEvent(SAHPI_ES_UPPER_MINOR,SAHPI_FALSE);
108+ m_event_data &= ~SAHPI_ES_UPPER_MINOR;
109+ }
110+
111+ }
112+ else {
113+ // See if the threshold is exceeded
114+ if (gt(m_read_data,thres->UpMinor)) {
115+ CreateThresholdEvent(SAHPI_ES_UPPER_MINOR,SAHPI_TRUE);
116+ m_event_data |= SAHPI_ES_UPPER_MINOR;
117+ }
118+ }
119+ }
120+
121+ if (thres->UpMajor.IsSupported) {
122+ if (m_event_data & SAHPI_ES_UPPER_MAJOR) {
123+ // See if the threshold is no longer exceeded
124+ if (lt(m_read_data,thres->UpMajor)) {
125+ CreateThresholdEvent(SAHPI_ES_UPPER_MAJOR,SAHPI_FALSE);
126+ m_event_data &= ~SAHPI_ES_UPPER_MAJOR;
127+ }
128+
129+ }
130+ else {
131+ // See if the threshold is exceeded
132+ if (gt(m_read_data,thres->UpMajor)) {
133+ CreateThresholdEvent(SAHPI_ES_UPPER_MAJOR,SAHPI_TRUE);
134+ m_event_data |= SAHPI_ES_UPPER_MAJOR;
135+ }
136+ }
137+ }
138+
139+ if (thres->UpCritical.IsSupported) {
140+ if (m_event_data & SAHPI_ES_UPPER_CRIT) {
141+ // See if the threshold is no longer exceeded
142+ if (lt(m_read_data,thres->UpCritical)) {
143+ CreateThresholdEvent(SAHPI_ES_UPPER_CRIT,SAHPI_FALSE);
144+ m_event_data &= ~SAHPI_ES_UPPER_CRIT;
145+ }
146+ }
147+ else {
148+ // See if the threshold is exceeded
149+ if (gt(m_read_data,thres->UpCritical)) {
150+ CreateThresholdEvent(SAHPI_ES_UPPER_CRIT,SAHPI_TRUE);
151+ m_event_data |= SAHPI_ES_UPPER_CRIT;
152+ }
153+ }
154+ }
155+
156+
157+
158+ if (thres->LowMinor.IsSupported) {
159+ // Crossing the threshold in both directions (from deasserted to asserted,
160+ // and from asserted to deasserted) needs to be handled.
161+
162+ if (m_event_data & SAHPI_ES_LOWER_MINOR) {
163+ // See if the threshold is no longer exceeded
164+ if (lt(m_read_data,thres->LowMinor)) {
165+ CreateThresholdEvent(SAHPI_ES_LOWER_MINOR,SAHPI_FALSE);
166+ m_event_data &= ~SAHPI_ES_LOWER_MINOR;
167+ }
168+
169+ }
170+ else {
171+ // See if the threshold is exceeded
172+ if (gt(m_read_data,thres->LowMinor)) {
173+ CreateThresholdEvent(SAHPI_ES_LOWER_MINOR,SAHPI_TRUE);
174+ m_event_data |= SAHPI_ES_LOWER_MINOR;
175+ }
176+ }
177+ }
178+
179+ if (thres->LowMajor.IsSupported) {
180+ if (m_event_data & SAHPI_ES_LOWER_MAJOR) {
181+ // See if the threshold is no longer exceeded
182+ if (lt(m_read_data,thres->LowMajor)) {
183+ CreateThresholdEvent(SAHPI_ES_LOWER_MAJOR,SAHPI_FALSE);
184+ m_event_data &= ~SAHPI_ES_LOWER_MAJOR;
185+ }
186+
187+ }
188+ else {
189+ // See if the threshold is exceeded
190+ if (gt(m_read_data,thres->LowMajor)) {
191+ CreateThresholdEvent(SAHPI_ES_LOWER_MAJOR,SAHPI_TRUE);
192+ m_event_data |= SAHPI_ES_LOWER_MAJOR;
193+ }
194+ }
195+ }
196+
197+ if (thres->LowCritical.IsSupported) {
198+ if (m_event_data & SAHPI_ES_LOWER_CRIT) {
199+ // See if the threshold is no longer exceeded
200+ if (lt(m_read_data,thres->LowCritical)) {
201+ CreateThresholdEvent(SAHPI_ES_LOWER_CRIT,SAHPI_FALSE);
202+ m_event_data &= ~SAHPI_ES_LOWER_CRIT;
203+ }
204+ }
205+ else {
206+ // See if the threshold is exceeded
207+ if (gt(m_read_data,thres->LowCritical)) {
208+ CreateThresholdEvent(SAHPI_ES_LOWER_CRIT,SAHPI_TRUE);
209+ m_event_data |= SAHPI_ES_LOWER_CRIT;
210+ }
211+ }
212+ }
213+
214+
215+ return SA_OK;
216+}
217+
218 /**
219 * Check whether the setting of one threshold value is allowed
220 *
221diff -Naur openhpi-3.0.0/plugins/dynamic_simulator/new_sim_sensor_threshold.h openhpi-3.0.0.oc/plugins/dynamic_simulator/new_sim_sensor_threshold.h
222--- openhpi-3.0.0/plugins/dynamic_simulator/new_sim_sensor_threshold.h 2011-10-17 13:57:23.000000000 -0200
223+++ openhpi-3.0.0.oc/plugins/dynamic_simulator/new_sim_sensor_threshold.h 2012-01-10 14:17:33.000000000 -0200
224@@ -73,6 +73,13 @@
225 // create an RDR sensor record
226 virtual bool CreateRdr( SaHpiRptEntryT &resource, SaHpiRdrT &rdr );
227
228+ // Check to see if changing the thresholds to the passed values
229+ // would result in an error. If so, raise the appropriate event.
230+ SaErrorT CheckThresholdsAndPublishEvents(const SaHpiSensorThresholdsT* newThres);
231+
232+ // Create a threshold event
233+ void CreateThresholdEvent(SaHpiEventStateT theActualEvent, SaHpiBoolT asserted);
234+
235 // official hpi functions
236
237 // get sensor data
diff --git a/recipes-extended/openhpi/files/xml.patch b/recipes-extended/openhpi/files/xml.patch
new file mode 100644
index 0000000..ddcea26
--- /dev/null
+++ b/recipes-extended/openhpi/files/xml.patch
@@ -0,0 +1,13 @@
1Index: openhpi-3.2.1/configure.ac
2===================================================================
3--- openhpi-3.2.1.orig/configure.ac
4+++ openhpi-3.2.1/configure.ac
5@@ -173,7 +173,7 @@ AC_CHECK_HEADERS([openssl/md2.h openssl/
6
7 dnl xml is used for XML-based communication in ilo2_ribcl and oa_soap
8 AC_CHECK_LIB([xml2],[xmlParseMemory],[XML2_LIB=-lxml2],[XML2_LIB=])
9-AC_CHECK_HEADERS([libxml2/libxml/xmlexports.h],[XML2_INCLUDE="-I/usr/include/libxml2"],[XML2_INCLUDE])
10+AC_CHECK_HEADERS([libxml/xmlexports.h])
11 AC_SUBST(XML2_LIB)
12 AC_SUBST(XML2_INCLUDE)
13
diff --git a/recipes-extended/openhpi/openhpi.inc b/recipes-extended/openhpi/openhpi.inc
new file mode 100644
index 0000000..d8b3e9b
--- /dev/null
+++ b/recipes-extended/openhpi/openhpi.inc
@@ -0,0 +1,15 @@
1DESCRIPTION = "This is the OpenIPMI library, a library that makes simplifies building complex IPMI management software."
2SECTION = "console/network"
3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=e3c772a32386888ccb5ae1c0ba95f1a4"
5DEPENDS = "openssl zlib net-snmp sysfsutils"
6
7INC_PR = "r0"
8
9inherit autotools gettext update-alternatives
10
11EXTRA_OECONF = "--with-libxml2=${STAGING_LIBDIR}/.. --with-net-snmp-config=${STAGING_BINDIR}/net-snmp-config"
12
13FILES_${PN} += "${libdir}/${PN}/*"
14
15INSANE_SKIP_${PN} = "dev-so"
diff --git a/recipes-extended/openhpi/openhpi_3.0.0.bb b/recipes-extended/openhpi/openhpi_3.0.0.bb
new file mode 100644
index 0000000..b6a3509
--- /dev/null
+++ b/recipes-extended/openhpi/openhpi_3.0.0.bb
@@ -0,0 +1,11 @@
1PR = "${INC_PR}.0"
2
3SRC_URI = "${SOURCEFORGE_MIRROR}/openhpi/openhpi-${PV}.tar.gz \
4 file://openhpi_openclovis.patch \
5 file://my_changes.patch \
6 file://xml.patch \
7 "
8SRC_URI[md5sum] = "9089cb59b732ff00b3805a1809405b4b"
9SRC_URI[sha256sum] = "2af5f40040a1b99b0c0a60f1bc03505d3d51f5c445cd04b1f832eb060acbb227"
10
11require openhpi.inc
diff --git a/recipes-extended/openipmi/openipmi-2.0.21/makefile.patch b/recipes-extended/openipmi/openipmi-2.0.21/makefile.patch
new file mode 100644
index 0000000..1fedc48
--- /dev/null
+++ b/recipes-extended/openipmi/openipmi-2.0.21/makefile.patch
@@ -0,0 +1,20 @@
1diff --git a/unix/Makefile.am b/unix/Makefile.am
2index a792147..a108bc6 100644
3--- a/unix/Makefile.am
4+++ b/unix/Makefile.am
5@@ -11,13 +11,13 @@ libOpenIPMIpthread_la_SOURCES = posix_thread_os_hnd.c selector.c
6 libOpenIPMIpthread_la_LIBADD = -lpthread $(GDBM_LIB) \
7 $(top_builddir)/utils/libOpenIPMIutils.la
8 libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
9- -Wl,-Map -Wl,libOpenIPMIpthread.map -L$(libdir)
10+ -Wl,-Map -Wl,libOpenIPMIpthread.map
11
12 libOpenIPMIposix_la_SOURCES = posix_os_hnd.c selector.c
13 libOpenIPMIposix_la_LIBADD = $(top_builddir)/utils/libOpenIPMIutils.la \
14 $(GDBM_LIB)
15 libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
16- -Wl,-Map -Wl,libOpenIPMIposix.map -L$(libdir)
17+ -Wl,-Map -Wl,libOpenIPMIposix.map
18
19 noinst_HEADERS = heap.h
20
diff --git a/recipes-extended/openipmi/openipmi-2.0.21/makefile_cmdlang.patch b/recipes-extended/openipmi/openipmi-2.0.21/makefile_cmdlang.patch
new file mode 100644
index 0000000..354e2b9
--- /dev/null
+++ b/recipes-extended/openipmi/openipmi-2.0.21/makefile_cmdlang.patch
@@ -0,0 +1,13 @@
1diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am
2index e80090d..b59ff24 100644
3--- a/cmdlang/Makefile.am
4+++ b/cmdlang/Makefile.am
5@@ -16,7 +16,7 @@ libOpenIPMIcmdlang_la_LIBADD = -lm \
6 $(top_builddir)/utils/libOpenIPMIutils.la \
7 $(top_builddir)/lib/libOpenIPMI.la
8 libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
9- -Wl,-Map -Wl,libOpenIPMIcmdlang.map -L$(libdir)
10+ -Wl,-Map -Wl,libOpenIPMIcmdlang.map
11
12 bin_PROGRAMS = openipmish
13
diff --git a/recipes-extended/openipmi/openipmi-2.0.21/makefile_glib.patch b/recipes-extended/openipmi/openipmi-2.0.21/makefile_glib.patch
new file mode 100644
index 0000000..4615ccc
--- /dev/null
+++ b/recipes-extended/openipmi/openipmi-2.0.21/makefile_glib.patch
@@ -0,0 +1,21 @@
1diff --git a/glib/Makefile.am b/glib/Makefile.am
2index 671cae2..eff55f3 100644
3--- a/glib/Makefile.am
4+++ b/glib/Makefile.am
5@@ -11,14 +11,14 @@ libOpenIPMIglib_la_SOURCES = glib_os_hnd.c
6 libOpenIPMIglib_la_CFLAGS = $(GLIB_CFLAGS) $(AM_CFLAGS)
7 libOpenIPMIglib_la_LIBADD = $(GDBM_LIB)
8 libOpenIPMIglib_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
9- -Wl,-Map -Wl,libOpenIPMIglib.map $(GLIB_LIBS) -L$(libdir) \
10+ -Wl,-Map -Wl,libOpenIPMIglib.map $(GLIB_LIBS) \
11 -rpath $(libdir)
12
13 libOpenIPMIglib12_la_SOURCES = glib_os_hnd.c
14 libOpenIPMIglib12_la_CFLAGS = $(GLIB12_CFLAGS) $(AM_CFLAGS)
15 libOpenIPMIglib12_la_LIBADD = $(GDBM_LIB)
16 libOpenIPMIglib12_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
17- -Wl,-Map -Wl,libOpenIPMIglib12.map $(GLIB12_LIBS) -L$(libdir) \
18+ -Wl,-Map -Wl,libOpenIPMIglib12.map $(GLIB12_LIBS) \
19 -rpath $(libdir)
20
21 CLEANFILES = libOpenIPMIglib.map libOpenIPMIglib12.map
diff --git a/recipes-extended/openipmi/openipmi-2.0.21/makefile_tcl.patch b/recipes-extended/openipmi/openipmi-2.0.21/makefile_tcl.patch
new file mode 100644
index 0000000..46911b5
--- /dev/null
+++ b/recipes-extended/openipmi/openipmi-2.0.21/makefile_tcl.patch
@@ -0,0 +1,13 @@
1diff --git a/tcl/Makefile.am b/tcl/Makefile.am
2index b702819..282619c 100644
3--- a/tcl/Makefile.am
4+++ b/tcl/Makefile.am
5@@ -11,7 +11,7 @@ libOpenIPMItcl_la_SOURCES = tcl_os_hnd.c
6 libOpenIPMItcl_la_CFLAGS = $(TCL_CFLAGS) $(AM_CFLAGS)
7 libOpenIPMItcl_la_LIBADD = $(GDBM_LIB)
8 libOpenIPMItcl_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
9- -Wl,-Map -Wl,libOpenIPMItcl.map $(TCL_LIBS) -L$(libdir) \
10+ -Wl,-Map -Wl,libOpenIPMItcl.map $(TCL_LIBS) \
11 -rpath $(libdir)
12
13 noinst_PROGRAMS = test_handlers
diff --git a/recipes-extended/openipmi/openipmi.inc b/recipes-extended/openipmi/openipmi.inc
new file mode 100644
index 0000000..eb2c252
--- /dev/null
+++ b/recipes-extended/openipmi/openipmi.inc
@@ -0,0 +1,19 @@
1DESCRIPTION = "This is the OpenIPMI library, a library that makes simplifies building complex IPMI management software."
2SECTION = "console/network"
3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
5DEPENDS = "openssl popt zlib"
6
7INC_PR = "r0"
8
9inherit autotools gettext update-alternatives
10
11EXTRA_OECONF = "\
12 --prefix=${prefix} \
13 --without-python \
14 ${@base_contains("OPENCLOVIS_FEATURES_ENABLE", "snmp", "--with-ucdsnmp=no", "", d)} \
15 "
16
17S = "${WORKDIR}/OpenIPMI-${PV}"
18
19PARALLEL_MAKEINST = ""
diff --git a/recipes-extended/openipmi/openipmi_2.0.21.bb b/recipes-extended/openipmi/openipmi_2.0.21.bb
new file mode 100644
index 0000000..6ada1d8
--- /dev/null
+++ b/recipes-extended/openipmi/openipmi_2.0.21.bb
@@ -0,0 +1,12 @@
1PR = "${INC_PR}.0"
2
3SRC_URI = "${SOURCEFORGE_MIRROR}/openipmi/OpenIPMI-${PV}.tar.gz \
4 file://makefile.patch \
5 file://makefile_glib.patch \
6 file://makefile_cmdlang.patch \
7 file://makefile_tcl.patch \
8 "
9SRC_URI[md5sum] = "dc0b42ae40b3f1d0db2a94b75b95fae1"
10SRC_URI[sha256sum] = "37b844d02119b94b31e2bb2bd8062ffdf6cd3eb4bc75fa6c47184e8b14fe95b8"
11
12require openipmi.inc
diff --git a/recipes-extended/packagegroups/packagegroup-saf-base.bb b/recipes-extended/packagegroups/packagegroup-saf-base.bb
new file mode 100644
index 0000000..909f0be
--- /dev/null
+++ b/recipes-extended/packagegroups/packagegroup-saf-base.bb
@@ -0,0 +1,44 @@
1#
2#
3#
4
5SUMMARY = "SAFplus Base Packages"
6DESCRIPTION = "Packages required to satisfy the Open Clovis SAFplus"
7PR = "r0"
8LICENSE = "MIT"
9
10inherit packagegroup
11
12OPENCLOVIS_FEATURES_ENABLE ?= "snmp hpi"
13
14PACKAGES = "\
15 packagegroup-saf-base \
16 packagegroup-saf-snmp \
17 packagegroup-saf-hpi \
18 "
19
20SUMMARY_packagegroup-saf-base = "SAF Base"
21DESCRIPTION_packagegroup-saf-base = "Packages required to support SAF frameworks"
22RDEPENDS_packagegroup-saf-base = "\
23 sqlite3 \
24 glib-2.0 \
25 gdbm \
26 tipcutils \
27 ${@base_contains("OPENCLOVIS_FEATURES_ENABLE", "snmp", "packagegroup-saf-snmp", "", d)} \
28 ${@base_contains("OPENCLOVIS_FEATURES_ENABLE", "hpi", "packagegroup-saf-hpi", "", d)} \
29 "
30
31SUMMARY_packagegroup-saf-snmp = "SAF SNMP support"
32DESCRIPTION_packagegroup-saf-snmp = "Packages required to support SAF frameworks with SNMP"
33RDEPENDS_packagegroup-saf-snmp = "\
34 net-snmp-libs \
35 net-snmp-server \
36 "
37
38SUMMARY_packagegroup-saf-hpi = "SAF HPI support"
39DESCRIPTION_packagegroup-saf-hpi = "Packages required to support SAF frameworks with HPI"
40RDEPENDS_packagegroup-saf-hpi = "\
41 openhpi \
42 openipmi \
43 ${@base_contains("OPENCLOVIS_FEATURES_ENABLE", "snmp", "openhpi-subagent", "", d)} \
44 "
diff --git a/recipes-extended/safplus/safplus_6.1.bb b/recipes-extended/safplus/safplus_6.1.bb
new file mode 100644
index 0000000..0f35a94
--- /dev/null
+++ b/recipes-extended/safplus/safplus_6.1.bb
@@ -0,0 +1,59 @@
1DESCRIPTION = "The canonical example of init scripts"
2SECTION = "base"
3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
5PR = "r0"
6
7DEPENDS = "sqlite3 glib-2.0 gdbm"
8RDEPENDS_${PN} = "sqlite3 glib-2.0 gdbm"
9RPROVIDES_${PN} += "libClUtils.so libmw.so libClDbal.so"
10
11SRC_URI = "git://github.com/OpenClovis/SAFplus-Availability-Scalability-Platform"
12
13inherit autotools
14
15S = "${WORKDIR}/${BP}/src/SAFplus"
16
17OC_SDK = "${WORKDIR}/clovis"
18OC_ASP_BUILD = "${WORKDIR}/asp_build"
19
20OC_TARGET_DIR = "${prefix}/target/${TARGET_ARCH}/${TARGET_OS}"
21
22EXTRA_OECONF = " \
23 --with-sdk-dir=${OC_SDK} \
24 --with-safplus-build \
25 --without-snmp-build \
26 --prefix=${D}${prefix} \
27 "
28
29do_configure () {
30
31 mkdir -p ${OC_SDK}/6.1/sdk
32 mkdir -p ${OC_SDK}/6.1/buildtools/yocto
33 mkdir -p ${OC_ASP_BUILD}
34 cd ${OC_ASP_BUILD}
35
36 TARGET=${TARGET_OS} \
37 ARCH=${TARGET_ARCH} \
38 MARCH=${TARGET_ARCH} \
39 ${S}/configure ${EXTRA_OECONF}
40}
41
42do_compile () {
43
44 cd ${OC_ASP_BUILD}/asp/build/local
45 make
46
47}
48
49do_install () {
50 cd ${OC_ASP_BUILD}/asp/build/local
51 make safplus-install
52}
53
54INSANE_SKIP_${PN} += "dev-so libdir"
55INSANE_SKIP_${PN}-dbg += "libdir"
56
57FILES_${PN}-dbg += " ${OC_TARGET_DIR}/lib/.debug ${OC_TARGET_DIR}/lib/shared-*/.debug"
58FILES_${PN}-staticdev += " ${OC_TARGET_DIR}/lib/*.a"
59FILES_${PN} += " ${OC_TARGET_DIR}"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-04-25 08:32:26 +0000