From 68f9a9c4ab01590d63506126660e3316ba668f99 Mon Sep 17 00:00:00 2001 From: João Henrique Ferreira de Freitas Date: Tue, 25 Feb 2014 19:26:26 -0300 Subject: Initial population --- LICENSE | 20 + README.md | 23 + conf/layer.conf | 13 + .../files/configure_pkgconfig_openhpiutils.patch | 38 + .../openhpi-subagent/files/fix_autoconf.patch | 38 + recipes-extended/openhpi-subagent/files/glib.patch | 21 + .../openhpi-subagent/files/glib_mutex.patch | 50 + .../openhpi-subagent/files/netsnmp_unused.patch | 5218 ++++++++++++++++++++ .../files/openhpi-subagent-2.3.4-format.patch | 193 + .../files/remove_unused_but_set_variable.patch | 20 + .../openhpi-subagent/openhpi-subagent.inc | 13 + .../openhpi-subagent/openhpi-subagent_2.3.4.bb | 15 + recipes-extended/openhpi/files/configure_fix.patch | 18 + recipes-extended/openhpi/files/my_changes.patch | 26 + recipes-extended/openhpi/files/my_xml.patch | 15 + .../openhpi/files/openhpi_openclovis.patch | 237 + recipes-extended/openhpi/files/xml.patch | 13 + recipes-extended/openhpi/openhpi.inc | 15 + recipes-extended/openhpi/openhpi_3.0.0.bb | 11 + .../openipmi/openipmi-2.0.21/makefile.patch | 20 + .../openipmi-2.0.21/makefile_cmdlang.patch | 13 + .../openipmi/openipmi-2.0.21/makefile_glib.patch | 21 + .../openipmi/openipmi-2.0.21/makefile_tcl.patch | 13 + recipes-extended/openipmi/openipmi.inc | 19 + recipes-extended/openipmi/openipmi_2.0.21.bb | 12 + .../packagegroups/packagegroup-saf-base.bb | 44 + recipes-extended/safplus/safplus_6.1.bb | 59 + 27 files changed, 6198 insertions(+) create mode 100644 LICENSE create mode 100644 README.md create mode 100644 conf/layer.conf create mode 100644 recipes-extended/openhpi-subagent/files/configure_pkgconfig_openhpiutils.patch create mode 100644 recipes-extended/openhpi-subagent/files/fix_autoconf.patch create mode 100644 recipes-extended/openhpi-subagent/files/glib.patch create mode 100644 recipes-extended/openhpi-subagent/files/glib_mutex.patch create mode 100644 recipes-extended/openhpi-subagent/files/netsnmp_unused.patch create mode 100644 recipes-extended/openhpi-subagent/files/openhpi-subagent-2.3.4-format.patch create mode 100644 recipes-extended/openhpi-subagent/files/remove_unused_but_set_variable.patch create mode 100644 recipes-extended/openhpi-subagent/openhpi-subagent.inc create mode 100644 recipes-extended/openhpi-subagent/openhpi-subagent_2.3.4.bb create mode 100644 recipes-extended/openhpi/files/configure_fix.patch create mode 100644 recipes-extended/openhpi/files/my_changes.patch create mode 100644 recipes-extended/openhpi/files/my_xml.patch create mode 100644 recipes-extended/openhpi/files/openhpi_openclovis.patch create mode 100644 recipes-extended/openhpi/files/xml.patch create mode 100644 recipes-extended/openhpi/openhpi.inc create mode 100644 recipes-extended/openhpi/openhpi_3.0.0.bb create mode 100644 recipes-extended/openipmi/openipmi-2.0.21/makefile.patch create mode 100644 recipes-extended/openipmi/openipmi-2.0.21/makefile_cmdlang.patch create mode 100644 recipes-extended/openipmi/openipmi-2.0.21/makefile_glib.patch create mode 100644 recipes-extended/openipmi/openipmi-2.0.21/makefile_tcl.patch create mode 100644 recipes-extended/openipmi/openipmi.inc create mode 100644 recipes-extended/openipmi/openipmi_2.0.21.bb create mode 100644 recipes-extended/packagegroups/packagegroup-saf-base.bb create mode 100644 recipes-extended/safplus/safplus_6.1.bb diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..7a45be4 --- /dev/null +++ b/LICENSE @@ -0,0 +1,20 @@ +The MIT License (MIT) + +Copyright (c) 2013 João Henrique Ferreira de Freitas + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION 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 @@ +meta-openclovis +=============== + +meta-openclovis + +This layer provides support for building SAFplus. + +Dependencies +------------ +This layer depends on: + +URI: git://github.com/openembedded/oe-core.git +branch: master +revision: HEAD +prio: default + +URI: git://github.com/openembedded/meta-oe.git +branch: master +revision: HEAD +layers: meta-oe + +BBFILE_PRIORITY_openembedded-layer = "4" + 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 @@ +# We have a conf and classes directory, add to BBPATH +BBPATH .= ":${LAYERDIR}" + +# We have a recipes directory, add to BBFILES +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ + ${LAYERDIR}/recipes-*/*/*.bbappend \ + " + +BBFILE_COLLECTIONS += "openclovis" +BBFILE_PATTERN_openclovis := "^${LAYERDIR}/" +BBFILE_PRIORITY_openclovis = "9" + +LAYERDEPENDS_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 @@ +Index: openhpi-subagent-2.3.4/configure.ac +=================================================================== +--- openhpi-subagent-2.3.4.orig/configure.ac ++++ openhpi-subagent-2.3.4/configure.ac +@@ -65,14 +65,14 @@ fi + + # uncomment the section below when libopenhpiutils + # has its own pkgconfig file 'openhpiutils.pc' +-# HPIUTILS_LIBS=`pkg-config --libs openhpiutils` +-# if test "x$HPIUTILS_LIBS" = "x"; then +-# AC_MSG_ERROR([ +-# *** OpenHpiUtils pkgconfig file wasn't found +-# *** we can't determine proper build flags without it +-# *** please check your installation +-# ]) +-# fi ++HPIUTILS_LIBS=`pkg-config --libs openhpiutils` ++if test "x$HPIUTILS_LIBS" = "x"; then ++ AC_MSG_ERROR([ ++ *** OpenHpiUtils pkgconfig file wasn't found ++ *** we can't determine proper build flags without it ++ *** please check your installation ++ ]) ++ fi + + LIBS=$HPI_LIBS + # Checks for libraries +@@ -90,8 +90,8 @@ AC_CHECK_LIB([openhpiutils], [oh_lookup_ + have_hpiutils=yes + # uncomment the 2 lines below when openhpiutils + # has its own pkgconfig file 'openhpiutils.pc' +-# HPIUTILS_FLAGS=`pkg-config --cflags openhpiutils` +-# HPIUTILS_LIBS=`pkg-config --libs openhpiutils` ++ HPIUTILS_FLAGS=`pkg-config --cflags openhpiutils` ++ HPIUTILS_LIBS=`pkg-config --libs openhpiutils` + ], + [OH_CHECK_FAIL(libopenhpiutils,openhpiutils-devel)]) + 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 @@ +diff -Naur openhpi-subagent-2.3.4-orig/acinclude.m4 openhpi-subagent-2.3.4/acinclude.m4 +--- openhpi-subagent-2.3.4-orig/acinclude.m4 2006-09-13 12:41:28.000000000 -0300 ++++ openhpi-subagent-2.3.4/acinclude.m4 2013-07-31 15:04:17.634435482 -0300 +@@ -54,9 +54,9 @@ + ], + [ + have_netsnmp=yes +- SNMPFLAGS=`net-snmp-config --cflags | sed -e 's/-Wdeclaration-after-statement//g'` +- SNMPALIBS=`net-snmp-config --agent-libs` +- SNMPVERSIONOK=`net-snmp-config --version | awk -F\. '{ \ ++ SNMPFLAGS=`${net_snmp_config:-net-snmp-config} --cflags | sed -e 's/-Wdeclaration-after-statement//g'` ++ SNMPALIBS=`${net_snmp_config:-net-snmp-config} --agent-libs` ++ SNMPVERSIONOK=`${net_snmp_config:-net-snmp-config} --version | awk -F\. '{ \ + if ( $[1] >= 5 ) { \ + if ( $[2] > 0 ) print "OK"; \ + if ( $[2] == 0) { \ +@@ -65,7 +65,7 @@ + } \ + }'` + # the following seems to work... thankfully. +- SNMPCONFDIR=`net-snmp-config --configure-options | perl -p -e 's/.*sysconfdir=([\/\w]+).*/\1/'` ++ SNMPCONFDIR=`${net_snmp_config:-net-snmp-config} --configure-options | perl -p -e 's/.*sysconfdir=([\/\w]+).*/\1/'` + if test "$SNMPVERSIONOK" == "OK"; then + AC_MSG_RESULT(yes) + else +diff -Naur openhpi-subagent-2.3.4-orig/configure.ac openhpi-subagent-2.3.4/configure.ac +--- openhpi-subagent-2.3.4-orig/configure.ac 2006-09-13 14:42:54.000000000 -0300 ++++ openhpi-subagent-2.3.4/configure.ac 2013-07-31 15:05:54.890438913 -0300 +@@ -95,6 +95,9 @@ + ], + [OH_CHECK_FAIL(libopenhpiutils,openhpiutils-devel)]) + ++AC_ARG_WITH(net-snmp-config, ++ [[ --with-net-snmp-config=SCRIPT run SCRIPT as net-snmp-config]], ++ [net_snmp_config=$withval]) + + OH_CHECK_NETSNMP + 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 @@ +Index: openhpi-subagent-2.3.4/src/hpiEventThread.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/hpiEventThread.c ++++ openhpi-subagent-2.3.4/src/hpiEventThread.c +@@ -178,14 +178,13 @@ int start_event_thread(SaHpiSessionIdT * + DEBUGMSGTL ((AGENT, "Attempting to init event")); + if (!g_thread_supported()) { + DEBUGMSGTL ((AGENT, "Initializing thread support")); +- g_thread_init(NULL); + } else { + DEBUGMSGTL ((AGENT, "Already supporting threads")); + } + +- event_thread = g_thread_create(event_thread_loop, ++ event_thread = g_thread_try_new("event_thread", ++ event_thread_loop, + (gpointer)sessionid, +- FALSE, + &event_thread_error); + + 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 @@ +Index: openhpi-subagent-2.3.4/include/hpiLock.h +=================================================================== +--- openhpi-subagent-2.3.4.orig/include/hpiLock.h ++++ openhpi-subagent-2.3.4/include/hpiLock.h +@@ -26,7 +26,7 @@ extern "C" { + #include + + typedef struct { +- GStaticRecMutex thread_mutex; ++ GRecMutex thread_mutex; + int lockcount; + }hpi_lock_type; + +Index: openhpi-subagent-2.3.4/src/hpiLock.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/hpiLock.c ++++ openhpi-subagent-2.3.4/src/hpiLock.c +@@ -21,7 +21,7 @@ + #include + + hpi_lock_type hpi_lock_data = { +- .thread_mutex = G_STATIC_REC_MUTEX_INIT, ++ .thread_mutex = G_STATIC_MUTEX_INIT, + .lockcount = 0 + }; + +@@ -29,12 +29,12 @@ hpi_lock_type hpi_lock_data = { + void subagent_lock( hpi_lock_type * hpi_lock_data) + { + +- if (!g_static_rec_mutex_trylock(&hpi_lock_data->thread_mutex)) { ++ if (!g_rec_mutex_trylock(&hpi_lock_data->thread_mutex)) { + + DEBUGMSGTL ((AGENT, "********Going to block for a lock now. %p - lockcount %d\n", + g_thread_self(), hpi_lock_data->lockcount)); + +- g_static_rec_mutex_lock(&hpi_lock_data->thread_mutex); ++ g_rec_mutex_lock(&hpi_lock_data->thread_mutex); + + hpi_lock_data->lockcount++; + +@@ -57,7 +57,7 @@ void subagent_unlock( hpi_lock_type * hp + + hpi_lock_data->lockcount--; + +- g_static_rec_mutex_unlock(&hpi_lock_data->thread_mutex); ++ g_rec_mutex_unlock(&hpi_lock_data->thread_mutex); + + DEBUGMSGTL ((AGENT,"Released the lock, %p - lockcount %d\n", + 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 @@ +Index: openhpi-subagent-2.3.4/src/saHpiAnnouncementEventLogTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiAnnouncementEventLogTable.c ++++ openhpi-subagent-2.3.4/src/saHpiAnnouncementEventLogTable.c +@@ -899,7 +899,6 @@ void saHpiAnnouncementEventLogTable_set_ + // saHpiAnnouncementEventLogTable_context *row_ctx = (saHpiAnnouncementEventLogTable_context *)rg->existing_row; + // saHpiAnnouncementEventLogTable_context *undo_ctx = (saHpiAnnouncementEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +- netsnmp_variable_list *var; + int rc; + + rg->rg_void = rg->list->ri; +@@ -910,7 +909,6 @@ void saHpiAnnouncementEventLogTable_set_ + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -1220,7 +1218,6 @@ void saHpiAnnouncementEventLogTable_set_ + */ + void saHpiAnnouncementEventLogTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiAnnouncementEventLogTable_context *row_ctx = (saHpiAnnouncementEventLogTable_context *)rg->existing_row; + // saHpiAnnouncementEventLogTable_context *undo_ctx = (saHpiAnnouncementEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1230,7 +1227,6 @@ void saHpiAnnouncementEventLogTable_set_ + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1303,7 +1299,6 @@ void saHpiAnnouncementEventLogTable_set_ + */ + void saHpiAnnouncementEventLogTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiAnnouncementEventLogTable_context *row_ctx = (saHpiAnnouncementEventLogTable_context *)rg->existing_row; + // saHpiAnnouncementEventLogTable_context *undo_ctx = (saHpiAnnouncementEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1313,7 +1308,6 @@ void saHpiAnnouncementEventLogTable_set_ + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1397,7 +1391,6 @@ void saHpiAnnouncementEventLogTable_set_ + */ + void saHpiAnnouncementEventLogTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiAnnouncementEventLogTable_context *row_ctx = (saHpiAnnouncementEventLogTable_context *)rg->existing_row; + // saHpiAnnouncementEventLogTable_context *undo_ctx = (saHpiAnnouncementEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1407,7 +1400,6 @@ void saHpiAnnouncementEventLogTable_set_ + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiAnnouncementTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiAnnouncementTable.c ++++ openhpi-subagent-2.3.4/src/saHpiAnnouncementTable.c +@@ -769,7 +769,6 @@ int announcement_delete (saHpiAnnounceme + + void update_announcements (SaHpiSessionIdT sessionid) + { +- SaErrorT rv; + + // FOR RPT + SaHpiEntryIdT rpt_entry_id; +@@ -782,14 +781,14 @@ void update_announcements (SaHpiSessionI + + DEBUGMSGTL ((AGENT, "update_announcements() Called\n")); + +- rv = clear_announcements(); ++ clear_announcements(); + + rpt_entry_id = SAHPI_FIRST_ENTRY; + do { +- rv = saHpiRptEntryGet(sessionid, rpt_entry_id, &rpt_entry_id, &rpt_entry); ++ saHpiRptEntryGet(sessionid, rpt_entry_id, &rpt_entry_id, &rpt_entry); + rdr_entry_id = SAHPI_FIRST_ENTRY; + do { +- rv = saHpiRdrGet(sessionid, ++ saHpiRdrGet(sessionid, + rpt_entry.ResourceId, + rdr_entry_id, + &rdr_entry_id, +@@ -1986,7 +1985,6 @@ void saHpiAnnouncementTable_set_action( + */ + void saHpiAnnouncementTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiAnnouncementTable_context *row_ctx = (saHpiAnnouncementTable_context *)rg->existing_row; + // saHpiAnnouncementTable_context *undo_ctx = (saHpiAnnouncementTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1999,7 +1997,6 @@ void saHpiAnnouncementTable_set_commit( + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -2080,7 +2077,6 @@ void saHpiAnnouncementTable_set_commit( + */ + void saHpiAnnouncementTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiAnnouncementTable_context *row_ctx = (saHpiAnnouncementTable_context *)rg->existing_row; + // saHpiAnnouncementTable_context *undo_ctx = (saHpiAnnouncementTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -2092,7 +2088,6 @@ void saHpiAnnouncementTable_set_free( ne + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -2184,7 +2179,6 @@ void saHpiAnnouncementTable_set_free( ne + */ + void saHpiAnnouncementTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiAnnouncementTable_context *row_ctx = (saHpiAnnouncementTable_context *)rg->existing_row; + // saHpiAnnouncementTable_context *undo_ctx = (saHpiAnnouncementTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -2196,7 +2190,6 @@ void saHpiAnnouncementTable_set_undo( ne + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiAnnunciatorTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiAnnunciatorTable.c ++++ openhpi-subagent-2.3.4/src/saHpiAnnunciatorTable.c +@@ -991,7 +991,6 @@ void saHpiAnnunciatorTable_set_action( n + */ + void saHpiAnnunciatorTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiAnnunciatorTable_context *row_ctx = (saHpiAnnunciatorTable_context *)rg->existing_row; + // saHpiAnnunciatorTable_context *undo_ctx = (saHpiAnnunciatorTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1002,7 +1001,6 @@ void saHpiAnnunciatorTable_set_commit( n + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -1031,7 +1029,6 @@ void saHpiAnnunciatorTable_set_commit( n + */ + void saHpiAnnunciatorTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiAnnunciatorTable_context *row_ctx = (saHpiAnnunciatorTable_context *)rg->existing_row; + // saHpiAnnunciatorTable_context *undo_ctx = (saHpiAnnunciatorTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1042,7 +1039,6 @@ void saHpiAnnunciatorTable_set_free( net + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -1083,7 +1079,6 @@ void saHpiAnnunciatorTable_set_free( net + */ + void saHpiAnnunciatorTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiAnnunciatorTable_context *row_ctx = (saHpiAnnunciatorTable_context *)rg->existing_row; + // saHpiAnnunciatorTable_context *undo_ctx = (saHpiAnnunciatorTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1094,7 +1089,6 @@ void saHpiAnnunciatorTable_set_undo( net + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiAreaTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiAreaTable.c ++++ openhpi-subagent-2.3.4/src/saHpiAreaTable.c +@@ -1141,7 +1141,6 @@ void saHpiAreaTable_set_reserve2( netsnm + // saHpiAreaTable_context *row_ctx = (saHpiAreaTable_context *)rg->existing_row; + // saHpiAreaTable_context *undo_ctx = (saHpiAreaTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +- netsnmp_variable_list *var; + int rc; + + DEBUGMSGTL ((AGENT, "saHpiAreaTable_set_reserve2, called\n")); +@@ -1154,7 +1153,6 @@ void saHpiAreaTable_set_reserve2( netsnm + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch (current->tri->colnum) { +@@ -1290,7 +1288,6 @@ void saHpiAreaTable_set_action( netsnmp_ + */ + void saHpiAreaTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiAreaTable_context *row_ctx = (saHpiAreaTable_context *)rg->existing_row; + // saHpiAreaTable_context *undo_ctx = (saHpiAreaTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1302,7 +1299,6 @@ void saHpiAreaTable_set_commit( netsnmp_ + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -1335,7 +1331,6 @@ void saHpiAreaTable_set_commit( netsnmp_ + */ + void saHpiAreaTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiAreaTable_context *row_ctx = (saHpiAreaTable_context *)rg->existing_row; + // saHpiAreaTable_context *undo_ctx = (saHpiAreaTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1347,7 +1342,6 @@ void saHpiAreaTable_set_free( netsnmp_re + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -1392,7 +1386,6 @@ void saHpiAreaTable_set_free( netsnmp_re + */ + void saHpiAreaTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiAreaTable_context *row_ctx = (saHpiAreaTable_context *)rg->existing_row; + // saHpiAreaTable_context *undo_ctx = (saHpiAreaTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1404,7 +1397,6 @@ void saHpiAreaTable_set_undo( netsnmp_re + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiAutoInsertTimeoutTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiAutoInsertTimeoutTable.c ++++ openhpi-subagent-2.3.4/src/saHpiAutoInsertTimeoutTable.c +@@ -614,7 +614,6 @@ void saHpiAutoInsertTimeoutTable_set_res + // saHpiAutoInsertTimeoutTable_context *row_ctx = (saHpiAutoInsertTimeoutTable_context *)rg->existing_row; + // saHpiAutoInsertTimeoutTable_context *undo_ctx = (saHpiAutoInsertTimeoutTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +- netsnmp_variable_list *var; + int rc; + + rg->rg_void = rg->list->ri; +@@ -625,7 +624,6 @@ void saHpiAutoInsertTimeoutTable_set_res + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -743,7 +741,6 @@ void saHpiAutoInsertTimeoutTable_set_act + */ + void saHpiAutoInsertTimeoutTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiAutoInsertTimeoutTable_context *row_ctx = (saHpiAutoInsertTimeoutTable_context *)rg->existing_row; + // saHpiAutoInsertTimeoutTable_context *undo_ctx = (saHpiAutoInsertTimeoutTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -753,7 +750,6 @@ void saHpiAutoInsertTimeoutTable_set_com + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -782,7 +778,6 @@ void saHpiAutoInsertTimeoutTable_set_com + */ + void saHpiAutoInsertTimeoutTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiAutoInsertTimeoutTable_context *row_ctx = (saHpiAutoInsertTimeoutTable_context *)rg->existing_row; + // saHpiAutoInsertTimeoutTable_context *undo_ctx = (saHpiAutoInsertTimeoutTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -792,7 +787,6 @@ void saHpiAutoInsertTimeoutTable_set_fre + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -832,7 +826,6 @@ void saHpiAutoInsertTimeoutTable_set_fre + */ + void saHpiAutoInsertTimeoutTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiAutoInsertTimeoutTable_context *row_ctx = (saHpiAutoInsertTimeoutTable_context *)rg->existing_row; + // saHpiAutoInsertTimeoutTable_context *undo_ctx = (saHpiAutoInsertTimeoutTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -842,7 +835,6 @@ void saHpiAutoInsertTimeoutTable_set_und + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiCtrlAnalogTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiCtrlAnalogTable.c ++++ openhpi-subagent-2.3.4/src/saHpiCtrlAnalogTable.c +@@ -1119,7 +1119,6 @@ void saHpiCtrlAnalogTable_set_action( ne + */ + void saHpiCtrlAnalogTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiCtrlAnalogTable_context *row_ctx = (saHpiCtrlAnalogTable_context *)rg->existing_row; + // saHpiCtrlAnalogTable_context *undo_ctx = (saHpiCtrlAnalogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1131,7 +1130,6 @@ void saHpiCtrlAnalogTable_set_commit( ne + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -1164,7 +1162,6 @@ void saHpiCtrlAnalogTable_set_commit( ne + */ + void saHpiCtrlAnalogTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiCtrlAnalogTable_context *row_ctx = (saHpiCtrlAnalogTable_context *)rg->existing_row; + // saHpiCtrlAnalogTable_context *undo_ctx = (saHpiCtrlAnalogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1176,7 +1173,6 @@ void saHpiCtrlAnalogTable_set_free( nets + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -1219,7 +1215,6 @@ void saHpiCtrlAnalogTable_set_free( nets + */ + void saHpiCtrlAnalogTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiCtrlAnalogTable_context *row_ctx = (saHpiCtrlAnalogTable_context *)rg->existing_row; + // saHpiCtrlAnalogTable_context *undo_ctx = (saHpiCtrlAnalogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1231,7 +1226,6 @@ void saHpiCtrlAnalogTable_set_undo( nets + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiCtrlDigitalTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiCtrlDigitalTable.c ++++ openhpi-subagent-2.3.4/src/saHpiCtrlDigitalTable.c +@@ -1090,7 +1090,6 @@ void saHpiCtrlDigitalTable_set_action( n + */ + void saHpiCtrlDigitalTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiCtrlDigitalTable_context *row_ctx = (saHpiCtrlDigitalTable_context *)rg->existing_row; + // saHpiCtrlDigitalTable_context *undo_ctx = (saHpiCtrlDigitalTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1102,7 +1101,6 @@ void saHpiCtrlDigitalTable_set_commit( n + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -1135,7 +1133,6 @@ void saHpiCtrlDigitalTable_set_commit( n + */ + void saHpiCtrlDigitalTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiCtrlDigitalTable_context *row_ctx = (saHpiCtrlDigitalTable_context *)rg->existing_row; + // saHpiCtrlDigitalTable_context *undo_ctx = (saHpiCtrlDigitalTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1148,7 +1145,6 @@ void saHpiCtrlDigitalTable_set_free( net + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -1193,7 +1189,6 @@ void saHpiCtrlDigitalTable_set_free( net + */ + void saHpiCtrlDigitalTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiCtrlDigitalTable_context *row_ctx = (saHpiCtrlDigitalTable_context *)rg->existing_row; + // saHpiCtrlDigitalTable_context *undo_ctx = (saHpiCtrlDigitalTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1205,7 +1200,6 @@ void saHpiCtrlDigitalTable_set_undo( net + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiCtrlDiscreteTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiCtrlDiscreteTable.c ++++ openhpi-subagent-2.3.4/src/saHpiCtrlDiscreteTable.c +@@ -1095,7 +1095,6 @@ void saHpiCtrlDiscreteTable_set_action( + */ + void saHpiCtrlDiscreteTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiCtrlDiscreteTable_context *row_ctx = (saHpiCtrlDiscreteTable_context *)rg->existing_row; + // saHpiCtrlDiscreteTable_context *undo_ctx = (saHpiCtrlDiscreteTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1105,7 +1104,6 @@ void saHpiCtrlDiscreteTable_set_commit( + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -1138,7 +1136,6 @@ void saHpiCtrlDiscreteTable_set_commit( + */ + void saHpiCtrlDiscreteTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiCtrlDiscreteTable_context *row_ctx = (saHpiCtrlDiscreteTable_context *)rg->existing_row; + // saHpiCtrlDiscreteTable_context *undo_ctx = (saHpiCtrlDiscreteTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1148,7 +1145,6 @@ void saHpiCtrlDiscreteTable_set_free( ne + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -1193,7 +1189,6 @@ void saHpiCtrlDiscreteTable_set_free( ne + */ + void saHpiCtrlDiscreteTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiCtrlDiscreteTable_context *row_ctx = (saHpiCtrlDiscreteTable_context *)rg->existing_row; + // saHpiCtrlDiscreteTable_context *undo_ctx = (saHpiCtrlDiscreteTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1203,7 +1198,6 @@ void saHpiCtrlDiscreteTable_set_undo( ne + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiCtrlOemTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiCtrlOemTable.c ++++ openhpi-subagent-2.3.4/src/saHpiCtrlOemTable.c +@@ -1098,7 +1098,6 @@ void saHpiCtrlOemTable_set_action( netsn + */ + void saHpiCtrlOemTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiCtrlOemTable_context *row_ctx = (saHpiCtrlOemTable_context *)rg->existing_row; + // saHpiCtrlOemTable_context *undo_ctx = (saHpiCtrlOemTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1108,7 +1107,6 @@ void saHpiCtrlOemTable_set_commit( netsn + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1141,7 +1139,6 @@ void saHpiCtrlOemTable_set_commit( netsn + */ + void saHpiCtrlOemTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiCtrlOemTable_context *row_ctx = (saHpiCtrlOemTable_context *)rg->existing_row; + // saHpiCtrlOemTable_context *undo_ctx = (saHpiCtrlOemTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1151,7 +1148,6 @@ void saHpiCtrlOemTable_set_free( netsnmp + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1194,7 +1190,6 @@ void saHpiCtrlOemTable_set_free( netsnmp + */ + void saHpiCtrlOemTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiCtrlOemTable_context *row_ctx = (saHpiCtrlOemTable_context *)rg->existing_row; + // saHpiCtrlOemTable_context *undo_ctx = (saHpiCtrlOemTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1204,7 +1199,6 @@ void saHpiCtrlOemTable_set_undo( netsnmp + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiCtrlStreamTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiCtrlStreamTable.c ++++ openhpi-subagent-2.3.4/src/saHpiCtrlStreamTable.c +@@ -1134,7 +1134,6 @@ void saHpiCtrlStreamTable_set_action( ne + */ + void saHpiCtrlStreamTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiCtrlStreamTable_context *row_ctx = (saHpiCtrlStreamTable_context *)rg->existing_row; + // saHpiCtrlStreamTable_context *undo_ctx = (saHpiCtrlStreamTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1146,7 +1145,6 @@ void saHpiCtrlStreamTable_set_commit( ne + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -1183,7 +1181,6 @@ void saHpiCtrlStreamTable_set_commit( ne + */ + void saHpiCtrlStreamTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiCtrlStreamTable_context *row_ctx = (saHpiCtrlStreamTable_context *)rg->existing_row; + // saHpiCtrlStreamTable_context *undo_ctx = (saHpiCtrlStreamTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1195,7 +1192,6 @@ void saHpiCtrlStreamTable_set_free( nets + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -1242,7 +1238,6 @@ void saHpiCtrlStreamTable_set_free( nets + */ + void saHpiCtrlStreamTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiCtrlStreamTable_context *row_ctx = (saHpiCtrlStreamTable_context *)rg->existing_row; + // saHpiCtrlStreamTable_context *undo_ctx = (saHpiCtrlStreamTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1254,7 +1249,6 @@ void saHpiCtrlStreamTable_set_undo( nets + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiCtrlTextTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiCtrlTextTable.c ++++ openhpi-subagent-2.3.4/src/saHpiCtrlTextTable.c +@@ -1133,7 +1133,6 @@ void saHpiCtrlTextTable_set_action( nets + */ + void saHpiCtrlTextTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiCtrlTextTable_context *row_ctx = (saHpiCtrlTextTable_context *)rg->existing_row; + // saHpiCtrlTextTable_context *undo_ctx = (saHpiCtrlTextTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1143,7 +1142,6 @@ void saHpiCtrlTextTable_set_commit( nets + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -1180,7 +1178,6 @@ void saHpiCtrlTextTable_set_commit( nets + */ + void saHpiCtrlTextTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiCtrlTextTable_context *row_ctx = (saHpiCtrlTextTable_context *)rg->existing_row; + // saHpiCtrlTextTable_context *undo_ctx = (saHpiCtrlTextTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1190,7 +1187,6 @@ void saHpiCtrlTextTable_set_free( netsnm + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -1237,7 +1233,6 @@ void saHpiCtrlTextTable_set_free( netsnm + */ + void saHpiCtrlTextTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiCtrlTextTable_context *row_ctx = (saHpiCtrlTextTable_context *)rg->existing_row; + // saHpiCtrlTextTable_context *undo_ctx = (saHpiCtrlTextTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1247,7 +1242,6 @@ void saHpiCtrlTextTable_set_undo( netsnm + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiCurrentSensorStateTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiCurrentSensorStateTable.c ++++ openhpi-subagent-2.3.4/src/saHpiCurrentSensorStateTable.c +@@ -1509,7 +1509,6 @@ void saHpiCurrentSensorStateTable_set_ac + */ + void saHpiCurrentSensorStateTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiCurrentSensorStateTable_context *row_ctx = + // (saHpiCurrentSensorStateTable_context *)rg->existing_row; + // saHpiCurrentSensorStateTable_context *undo_ctx = +@@ -1523,7 +1522,6 @@ void saHpiCurrentSensorStateTable_set_co + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -1572,7 +1570,6 @@ void saHpiCurrentSensorStateTable_set_co + */ + void saHpiCurrentSensorStateTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiCurrentSensorStateTable_context *row_ctx = + // (saHpiCurrentSensorStateTable_context *)rg->existing_row; + // saHpiCurrentSensorStateTable_context *undo_ctx = +@@ -1586,7 +1583,6 @@ void saHpiCurrentSensorStateTable_set_fr + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -1645,7 +1641,6 @@ void saHpiCurrentSensorStateTable_set_fr + */ + void saHpiCurrentSensorStateTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiCurrentSensorStateTable_context *row_ctx = + // (saHpiCurrentSensorStateTable_context *)rg->existing_row; + // saHpiCurrentSensorStateTable_context *undo_ctx = +@@ -1659,7 +1654,6 @@ void saHpiCurrentSensorStateTable_set_un + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiDomainAlarmTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiDomainAlarmTable.c ++++ openhpi-subagent-2.3.4/src/saHpiDomainAlarmTable.c +@@ -1639,7 +1639,6 @@ void saHpiDomainAlarmTable_set_action( n + */ + void saHpiDomainAlarmTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiDomainAlarmTable_context *row_ctx = (saHpiDomainAlarmTable_context *)rg->existing_row; + // saHpiDomainAlarmTable_context *undo_ctx = (saHpiDomainAlarmTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1649,7 +1648,6 @@ void saHpiDomainAlarmTable_set_commit( n + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1730,7 +1728,6 @@ void saHpiDomainAlarmTable_set_commit( n + */ + void saHpiDomainAlarmTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiDomainAlarmTable_context *row_ctx = (saHpiDomainAlarmTable_context *)rg->existing_row; + // saHpiDomainAlarmTable_context *undo_ctx = (saHpiDomainAlarmTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1740,7 +1737,6 @@ void saHpiDomainAlarmTable_set_free( net + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1832,7 +1828,6 @@ void saHpiDomainAlarmTable_set_free( net + */ + void saHpiDomainAlarmTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiDomainAlarmTable_context *row_ctx = (saHpiDomainAlarmTable_context *)rg->existing_row; + // saHpiDomainAlarmTable_context *undo_ctx = (saHpiDomainAlarmTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1842,7 +1837,6 @@ void saHpiDomainAlarmTable_set_undo( net + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiDomainEventLogTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiDomainEventLogTable.c ++++ openhpi-subagent-2.3.4/src/saHpiDomainEventLogTable.c +@@ -102,7 +102,6 @@ SaErrorT populate_saHpiDomainEventLogTab + oid * this_child_oid, + size_t *this_child_oid_len) + { +- SaErrorT rv = SA_OK; + + oid domain_evt_oid[DOMAIN_EVENT_LOG_INDEX_NR]; + netsnmp_index domain_evt_idx; +@@ -153,7 +152,7 @@ SaErrorT populate_saHpiDomainEventLogTab + /* create full oid on This row for parent RowPointer */ + column[0] = 1; + column[1] = COLUMN_SAHPIDOMAINEVENTLOGTIMESTAMP; +- memset(this_child_oid, 0, sizeof(this_child_oid)); ++ memset(this_child_oid, 0, MAX_OID_LEN); + build_full_oid(saHpiDomainEventLogTable_oid, saHpiDomainEventLogTable_oid_len, + column, column_len, + &domain_evt_idx, +@@ -174,7 +173,7 @@ SaErrorT populate_saHpiDomainEventLogTab + + if (!domain_evt_ctx) { + snmp_log (LOG_ERR, "Not enough memory for a Domain Event Log row!"); +- rv = AGENT_ERR_INTERNAL_ERROR; ++ return AGENT_ERR_INTERNAL_ERROR; + } + + /** SaHpiEntryId = ASN_UNSIGNED */ +@@ -217,7 +216,6 @@ SaErrorT domain_event_log_clear(SaHpiSes + + oid domain_evt_oid[DOMAIN_EVENT_LOG_INDEX_NR]; + netsnmp_index domain_evt_idx; +- netsnmp_index *domain_index; + saHpiDomainEventLogTable_context *domain_evt_ctx; + + DR_XREF *dr_entry; +@@ -244,7 +242,7 @@ SaErrorT domain_event_log_clear(SaHpiSes + /* assign the indices to the index */ + domain_evt_idx.oids = (oid *) & domain_evt_oid; + +- domain_index = CONTAINER_FIRST(cb.container); ++ CONTAINER_FIRST(cb.container); + domain_evt_ctx = CONTAINER_FIND(cb.container, &domain_evt_idx); + + if (!domain_evt_ctx) { +@@ -826,7 +824,6 @@ void saHpiDomainEventLogTable_set_reserv + // (saHpiDomainEventLogTable_context *)rg->existing_row; + // saHpiDomainEventLogTable_context *undo_ctx = + // (saHpiDomainEventLogTable_context *)rg->undo_info; +- netsnmp_variable_list *var; + netsnmp_request_group_item *current; + int rc; + +@@ -839,7 +836,6 @@ void saHpiDomainEventLogTable_set_reserv + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -866,7 +862,6 @@ void saHpiDomainEventLogTable_set_reserv + // saHpiDomainEventLogTable_context *row_ctx = (saHpiDomainEventLogTable_context *)rg->existing_row; + // saHpiDomainEventLogTable_context *undo_ctx = (saHpiDomainEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +- netsnmp_variable_list *var; + int rc; + + rg->rg_void = rg->list->ri; +@@ -877,7 +872,6 @@ void saHpiDomainEventLogTable_set_reserv + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -909,7 +903,6 @@ void saHpiDomainEventLogTable_set_reserv + */ + void saHpiDomainEventLogTable_set_action( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiDomainEventLogTable_context *row_ctx = (saHpiDomainEventLogTable_context *)rg->existing_row; + // saHpiDomainEventLogTable_context *undo_ctx = (saHpiDomainEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -924,7 +917,6 @@ void saHpiDomainEventLogTable_set_action + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -970,7 +962,6 @@ void saHpiDomainEventLogTable_set_action + */ + void saHpiDomainEventLogTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiDomainEventLogTable_context *row_ctx = (saHpiDomainEventLogTable_context *)rg->existing_row; + // saHpiDomainEventLogTable_context *undo_ctx = (saHpiDomainEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -980,7 +971,6 @@ void saHpiDomainEventLogTable_set_commit + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1005,7 +995,6 @@ void saHpiDomainEventLogTable_set_commit + */ + void saHpiDomainEventLogTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiDomainEventLogTable_context *row_ctx = (saHpiDomainEventLogTable_context *)rg->existing_row; + // saHpiDomainEventLogTable_context *undo_ctx = (saHpiDomainEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1015,7 +1004,6 @@ void saHpiDomainEventLogTable_set_free( + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1051,7 +1039,6 @@ void saHpiDomainEventLogTable_set_free( + */ + void saHpiDomainEventLogTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiDomainEventLogTable_context *row_ctx = (saHpiDomainEventLogTable_context *)rg->existing_row; + // saHpiDomainEventLogTable_context *undo_ctx = (saHpiDomainEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1061,7 +1048,6 @@ void saHpiDomainEventLogTable_set_undo( + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiDomainEventTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiDomainEventTable.c ++++ openhpi-subagent-2.3.4/src/saHpiDomainEventTable.c +@@ -103,7 +103,6 @@ SaErrorT populate_saHpiDomainEventTable( + oid * this_child_oid, + size_t *this_child_oid_len) + { +- SaErrorT rv = SA_OK; + int new_row = MIB_FALSE; + + oid domain_evt_oid[DOMAIN_EVENT_INDEX_NR]; +@@ -162,7 +161,7 @@ SaErrorT populate_saHpiDomainEventTable( + } + if (!domain_evt_ctx) { + snmp_log (LOG_ERR, "Not enough memory for a Domain Event row!"); +- rv = AGENT_ERR_INTERNAL_ERROR; ++ return AGENT_ERR_INTERNAL_ERROR; + } + + /** SaHpiEntryId = ASN_UNSIGNED */ +@@ -184,7 +183,7 @@ SaErrorT populate_saHpiDomainEventTable( + /* create full oid on This row for parent RowPointer */ + column[0] = 1; + column[1] = COLUMN_SAHPIDOMAINEVENTTIMESTAMP; +- memset(this_child_oid, 0, sizeof(this_child_oid)); ++ memset(this_child_oid, 0, sizeof(*this_child_oid)); + build_full_oid(saHpiDomainEventTable_oid, saHpiDomainEventTable_oid_len, + column, column_len, + &domain_evt_idx, +@@ -203,7 +202,6 @@ SaErrorT async_domain_event_add(SaHpiSes + oid * this_child_oid, + size_t *this_child_oid_len) + { +- SaErrorT rv = SA_OK; + int new_row = MIB_FALSE; + + oid domain_evt_oid[DOMAIN_EVENT_INDEX_NR]; +@@ -257,7 +255,7 @@ SaErrorT async_domain_event_add(SaHpiSes + } + if (!domain_evt_ctx) { + snmp_log (LOG_ERR, "Not enough memory for a Domain Event row!"); +- rv = AGENT_ERR_INTERNAL_ERROR; ++ return AGENT_ERR_INTERNAL_ERROR; + } + + /** SaHpiEntryId = ASN_UNSIGNED */ +@@ -279,7 +277,7 @@ SaErrorT async_domain_event_add(SaHpiSes + /* create full oid on This row for parent RowPointer */ + column[0] = 1; + column[1] = COLUMN_SAHPIDOMAINEVENTTIMESTAMP; +- memset(this_child_oid, 0, sizeof(this_child_oid)); ++ memset(this_child_oid, 0, sizeof(*this_child_oid)); + build_full_oid(saHpiDomainEventTable_oid, saHpiDomainEventTable_oid_len, + column, column_len, + &domain_evt_idx, +@@ -836,7 +834,6 @@ void saHpiDomainEventTable_set_reserve1( + // (saHpiDomainEventTable_context *)rg->existing_row; + // saHpiDomainEventTable_context *undo_ctx = + // (saHpiDomainEventTable_context *)rg->undo_info; +- netsnmp_variable_list *var; + netsnmp_request_group_item *current; + int rc; + +@@ -849,7 +846,6 @@ void saHpiDomainEventTable_set_reserve1( + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -876,7 +872,6 @@ void saHpiDomainEventTable_set_reserve2( + // saHpiDomainEventTable_context *row_ctx = (saHpiDomainEventTable_context *)rg->existing_row; + // saHpiDomainEventTable_context *undo_ctx = (saHpiDomainEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +- netsnmp_variable_list *var; + int rc; + + rg->rg_void = rg->list->ri; +@@ -887,7 +882,6 @@ void saHpiDomainEventTable_set_reserve2( + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -919,7 +913,6 @@ void saHpiDomainEventTable_set_reserve2( + */ + void saHpiDomainEventTable_set_action( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiDomainEventTable_context *row_ctx = (saHpiDomainEventTable_context *)rg->existing_row; + // saHpiDomainEventTable_context *undo_ctx = (saHpiDomainEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -934,7 +927,6 @@ void saHpiDomainEventTable_set_action( n + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -985,7 +977,6 @@ void saHpiDomainEventTable_set_action( n + */ + void saHpiDomainEventTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiDomainEventTable_context *row_ctx = (saHpiDomainEventTable_context *)rg->existing_row; + // saHpiDomainEventTable_context *undo_ctx = (saHpiDomainEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -995,7 +986,6 @@ void saHpiDomainEventTable_set_commit( n + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1020,7 +1010,6 @@ void saHpiDomainEventTable_set_commit( n + */ + void saHpiDomainEventTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiDomainEventTable_context *row_ctx = (saHpiDomainEventTable_context *)rg->existing_row; + // saHpiDomainEventTable_context *undo_ctx = (saHpiDomainEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1030,7 +1019,6 @@ void saHpiDomainEventTable_set_free( net + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1065,7 +1053,6 @@ void saHpiDomainEventTable_set_free( net + */ + void saHpiDomainEventTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiDomainEventTable_context *row_ctx = (saHpiDomainEventTable_context *)rg->existing_row; + // saHpiDomainEventTable_context *undo_ctx = (saHpiDomainEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1075,7 +1062,6 @@ void saHpiDomainEventTable_set_undo( net + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiDomainInfoTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiDomainInfoTable.c ++++ openhpi-subagent-2.3.4/src/saHpiDomainInfoTable.c +@@ -955,8 +955,6 @@ void saHpiDomainInfoTable_set_action( ne + // saHpiDomainInfoTable_context *undo_ctx = (saHpiDomainInfoTable_context *)rg->undo_info; + netsnmp_request_group_item *current; + +- int row_err = 0; +- + subagent_lock(&hpi_lock_data); + + /* +@@ -972,20 +970,20 @@ void saHpiDomainInfoTable_set_action( ne + case COLUMN_SAHPIDOMAINTAGTEXTTYPE: + /** SaHpiTextType = ASN_INTEGER */ + row_ctx->saHpiDomainTagTextType = *var->val.integer; +- row_err = set_table_domain_tag(row_ctx); ++ set_table_domain_tag(row_ctx); + break; + + case COLUMN_SAHPIDOMAINTAGTEXTLANGUAGE: + /** SaHpiTextLanguage = ASN_INTEGER */ + row_ctx->saHpiDomainTagTextLanguage = *var->val.integer; +- row_err = set_table_domain_tag(row_ctx); ++ set_table_domain_tag(row_ctx); + break; + + case COLUMN_SAHPIDOMAINTAG: + /** SaHpiText = ASN_OCTET_STR */ + memcpy(row_ctx->saHpiDomainTag,var->val.string,var->val_len); + row_ctx->saHpiDomainTag_len = var->val_len; +- row_err = set_table_domain_tag(row_ctx); ++ set_table_domain_tag(row_ctx); + break; + + default: /** We shouldn't get here */ +@@ -1016,7 +1014,6 @@ void saHpiDomainInfoTable_set_action( ne + */ + void saHpiDomainInfoTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiDomainInfoTable_context *row_ctx = (saHpiDomainInfoTable_context *)rg->existing_row; + // saHpiDomainInfoTable_context *undo_ctx = (saHpiDomainInfoTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1026,7 +1023,6 @@ void saHpiDomainInfoTable_set_commit( ne + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1063,7 +1059,6 @@ void saHpiDomainInfoTable_set_commit( ne + */ + void saHpiDomainInfoTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiDomainInfoTable_context *row_ctx = (saHpiDomainInfoTable_context *)rg->existing_row; + // saHpiDomainInfoTable_context *undo_ctx = (saHpiDomainInfoTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1073,7 +1068,6 @@ void saHpiDomainInfoTable_set_free( nets + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1121,7 +1115,6 @@ void saHpiDomainInfoTable_set_free( nets + */ + void saHpiDomainInfoTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiDomainInfoTable_context *row_ctx = (saHpiDomainInfoTable_context *)rg->existing_row; + // saHpiDomainInfoTable_context *undo_ctx = (saHpiDomainInfoTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1131,7 +1124,6 @@ void saHpiDomainInfoTable_set_undo( nets + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiDomainReferenceTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiDomainReferenceTable.c ++++ openhpi-subagent-2.3.4/src/saHpiDomainReferenceTable.c +@@ -653,7 +653,6 @@ void saHpiDomainReferenceTable_set_reser + // (saHpiDomainReferenceTable_context *)rg->existing_row; + // saHpiDomainReferenceTable_context *undo_ctx = + // (saHpiDomainReferenceTable_context *)rg->undo_info; +- netsnmp_variable_list *var; + netsnmp_request_group_item *current; + int rc; + +@@ -666,7 +665,6 @@ void saHpiDomainReferenceTable_set_reser + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -693,7 +691,6 @@ void saHpiDomainReferenceTable_set_reser + // saHpiDomainReferenceTable_context *row_ctx = (saHpiDomainReferenceTable_context *)rg->existing_row; + // saHpiDomainReferenceTable_context *undo_ctx = (saHpiDomainReferenceTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +- netsnmp_variable_list *var; + int rc; + + rg->rg_void = rg->list->ri; +@@ -704,7 +701,6 @@ void saHpiDomainReferenceTable_set_reser + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -736,7 +732,6 @@ void saHpiDomainReferenceTable_set_reser + */ + void saHpiDomainReferenceTable_set_action( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiDomainReferenceTable_context *row_ctx = (saHpiDomainReferenceTable_context *)rg->existing_row; + // saHpiDomainReferenceTable_context *undo_ctx = (saHpiDomainReferenceTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -751,7 +746,6 @@ void saHpiDomainReferenceTable_set_actio + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -783,7 +777,6 @@ void saHpiDomainReferenceTable_set_actio + */ + void saHpiDomainReferenceTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiDomainReferenceTable_context *row_ctx = (saHpiDomainReferenceTable_context *)rg->existing_row; + // saHpiDomainReferenceTable_context *undo_ctx = (saHpiDomainReferenceTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -793,7 +786,6 @@ void saHpiDomainReferenceTable_set_commi + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -818,7 +810,6 @@ void saHpiDomainReferenceTable_set_commi + */ + void saHpiDomainReferenceTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiDomainReferenceTable_context *row_ctx = (saHpiDomainReferenceTable_context *)rg->existing_row; + // saHpiDomainReferenceTable_context *undo_ctx = (saHpiDomainReferenceTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -828,7 +819,6 @@ void saHpiDomainReferenceTable_set_free( + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -863,7 +853,6 @@ void saHpiDomainReferenceTable_set_free( + */ + void saHpiDomainReferenceTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiDomainReferenceTable_context *row_ctx = (saHpiDomainReferenceTable_context *)rg->existing_row; + // saHpiDomainReferenceTable_context *undo_ctx = (saHpiDomainReferenceTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -873,7 +862,6 @@ void saHpiDomainReferenceTable_set_undo( + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiEventLogInfoTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiEventLogInfoTable.c ++++ openhpi-subagent-2.3.4/src/saHpiEventLogInfoTable.c +@@ -416,7 +416,6 @@ int event_log_info_clear (saHpiEventLogI + SaHpiSessionIdT session_id; + SaHpiResourceIdT resource_id; + +- int rv = SNMP_ERR_NOERROR; + + DEBUGMSGTL ((AGENT, "event_log_info_clear, called\n")); + +@@ -444,7 +443,7 @@ int event_log_info_clear (saHpiEventLogI + } + + /* it succeeded clear the underlying tables */ +- rv = event_log_clear(session_id, resource_id, MIB_FALSE); ++ event_log_clear(session_id, resource_id, MIB_FALSE); + + return SNMP_ERR_NOERROR; + +@@ -1230,7 +1229,6 @@ void saHpiEventLogInfoTable_set_reserve2 + // saHpiEventLogInfoTable_context *row_ctx = (saHpiEventLogInfoTable_context *)rg->existing_row; + //saHpiEventLogInfoTable_context *undo_ctx = (saHpiEventLogInfoTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +- netsnmp_variable_list *var; + int rc; + + rg->rg_void = rg->list->ri; +@@ -1241,7 +1239,6 @@ void saHpiEventLogInfoTable_set_reserve2 + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -1395,7 +1392,6 @@ void saHpiEventLogInfoTable_set_action( + */ + void saHpiEventLogInfoTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiEventLogInfoTable_context *row_ctx = (saHpiEventLogInfoTable_context *)rg->existing_row; + // saHpiEventLogInfoTable_context *undo_ctx = (saHpiEventLogInfoTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1405,7 +1401,6 @@ void saHpiEventLogInfoTable_set_commit( + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1446,7 +1441,6 @@ void saHpiEventLogInfoTable_set_commit( + */ + void saHpiEventLogInfoTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiEventLogInfoTable_context *row_ctx = (saHpiEventLogInfoTable_context *)rg->existing_row; + // saHpiEventLogInfoTable_context *undo_ctx = (saHpiEventLogInfoTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1456,7 +1450,6 @@ void saHpiEventLogInfoTable_set_free( ne + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1509,7 +1502,6 @@ void saHpiEventLogInfoTable_set_free( ne + */ + void saHpiEventLogInfoTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiEventLogInfoTable_context *row_ctx = (saHpiEventLogInfoTable_context *)rg->existing_row; + // saHpiEventLogInfoTable_context *undo_ctx = (saHpiEventLogInfoTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1519,7 +1511,6 @@ void saHpiEventLogInfoTable_set_undo( ne + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiEventLogTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiEventLogTable.c ++++ openhpi-subagent-2.3.4/src/saHpiEventLogTable.c +@@ -1116,7 +1116,6 @@ void saHpiEventLogTable_set_reserve1( ne + // (saHpiEventLogTable_context *)rg->existing_row; + // saHpiEventLogTable_context *undo_ctx = + // (saHpiEventLogTable_context *)rg->undo_info; +- netsnmp_variable_list *var; + netsnmp_request_group_item *current; + int rc; + +@@ -1129,7 +1128,6 @@ void saHpiEventLogTable_set_reserve1( ne + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -1156,7 +1154,6 @@ void saHpiEventLogTable_set_reserve2( ne + // saHpiEventLogTable_context *row_ctx = (saHpiEventLogTable_context *)rg->existing_row; + // saHpiEventLogTable_context *undo_ctx = (saHpiEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +- netsnmp_variable_list *var; + int rc; + + rg->rg_void = rg->list->ri; +@@ -1167,7 +1164,6 @@ void saHpiEventLogTable_set_reserve2( ne + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -1199,7 +1195,6 @@ void saHpiEventLogTable_set_reserve2( ne + */ + void saHpiEventLogTable_set_action( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiEventLogTable_context *row_ctx = (saHpiEventLogTable_context *)rg->existing_row; + // saHpiEventLogTable_context *undo_ctx = (saHpiEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1213,7 +1208,6 @@ void saHpiEventLogTable_set_action( nets + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1250,7 +1244,6 @@ void saHpiEventLogTable_set_action( nets + */ + void saHpiEventLogTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiEventLogTable_context *row_ctx = (saHpiEventLogTable_context *)rg->existing_row; + // saHpiEventLogTable_context *undo_ctx = (saHpiEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1260,7 +1253,6 @@ void saHpiEventLogTable_set_commit( nets + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1285,7 +1277,6 @@ void saHpiEventLogTable_set_commit( nets + */ + void saHpiEventLogTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiEventLogTable_context *row_ctx = (saHpiEventLogTable_context *)rg->existing_row; + // saHpiEventLogTable_context *undo_ctx = (saHpiEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1295,7 +1286,6 @@ void saHpiEventLogTable_set_free( netsnm + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1332,7 +1322,6 @@ void saHpiEventLogTable_set_free( netsnm + */ + void saHpiEventLogTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiEventLogTable_context *row_ctx = (saHpiEventLogTable_context *)rg->existing_row; + // saHpiEventLogTable_context *undo_ctx = (saHpiEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1342,7 +1331,6 @@ void saHpiEventLogTable_set_undo( netsnm + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiEventTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiEventTable.c ++++ openhpi-subagent-2.3.4/src/saHpiEventTable.c +@@ -883,7 +883,6 @@ void saHpiEventTable_set_reserve1( netsn + // (saHpiEventTable_context *)rg->existing_row; + // saHpiEventTable_context *undo_ctx = + // (saHpiEventTable_context *)rg->undo_info; +- netsnmp_variable_list *var; + netsnmp_request_group_item *current; + int rc; + +@@ -896,7 +895,6 @@ void saHpiEventTable_set_reserve1( netsn + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -923,7 +921,6 @@ void saHpiEventTable_set_reserve2( netsn + // saHpiEventTable_context *row_ctx = (saHpiEventTable_context *)rg->existing_row; + // saHpiEventTable_context *undo_ctx = (saHpiEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +- netsnmp_variable_list *var; + int rc; + + rg->rg_void = rg->list->ri; +@@ -934,7 +931,6 @@ void saHpiEventTable_set_reserve2( netsn + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -966,7 +962,6 @@ void saHpiEventTable_set_reserve2( netsn + */ + void saHpiEventTable_set_action( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiEventTable_context *row_ctx = (saHpiEventTable_context *)rg->existing_row; + // saHpiEventTable_context *undo_ctx = (saHpiEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -980,7 +975,6 @@ void saHpiEventTable_set_action( netsnmp + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1017,7 +1011,6 @@ void saHpiEventTable_set_action( netsnmp + */ + void saHpiEventTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiEventTable_context *row_ctx = (saHpiEventTable_context *)rg->existing_row; + // saHpiEventTable_context *undo_ctx = (saHpiEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1027,7 +1020,6 @@ void saHpiEventTable_set_commit( netsnmp + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1052,7 +1044,6 @@ void saHpiEventTable_set_commit( netsnmp + */ + void saHpiEventTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiEventTable_context *row_ctx = (saHpiEventTable_context *)rg->existing_row; + // saHpiEventTable_context *undo_ctx = (saHpiEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1062,7 +1053,6 @@ void saHpiEventTable_set_free( netsnmp_r + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1099,7 +1089,6 @@ void saHpiEventTable_set_free( netsnmp_r + */ + void saHpiEventTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiEventTable_context *row_ctx = (saHpiEventTable_context *)rg->existing_row; + // saHpiEventTable_context *undo_ctx = (saHpiEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1109,7 +1098,6 @@ void saHpiEventTable_set_undo( netsnmp_r + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiFieldTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiFieldTable.c ++++ openhpi-subagent-2.3.4/src/saHpiFieldTable.c +@@ -1441,7 +1441,6 @@ void saHpiFieldTable_set_reserve2( netsn + // saHpiFieldTable_context *row_ctx = (saHpiFieldTable_context *)rg->existing_row; + // saHpiFieldTable_context *undo_ctx = (saHpiFieldTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +- netsnmp_variable_list *var; + int rc; + + DEBUGMSGTL ((AGENT, "saHpiFieldTable_set_reserve2, called\n")); +@@ -1454,7 +1453,6 @@ void saHpiFieldTable_set_reserve2( netsn + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -1666,7 +1664,6 @@ void saHpiFieldTable_set_action( netsnmp + */ + void saHpiFieldTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiFieldTable_context *row_ctx = (saHpiFieldTable_context *)rg->existing_row; + // saHpiFieldTable_context *undo_ctx = (saHpiFieldTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1678,7 +1675,6 @@ void saHpiFieldTable_set_commit( netsnmp + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1723,7 +1719,6 @@ void saHpiFieldTable_set_commit( netsnmp + */ + void saHpiFieldTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiFieldTable_context *row_ctx = (saHpiFieldTable_context *)rg->existing_row; + // saHpiFieldTable_context *undo_ctx = (saHpiFieldTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1735,7 +1730,6 @@ void saHpiFieldTable_set_free( netsnmp_r + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1792,7 +1786,6 @@ void saHpiFieldTable_set_free( netsnmp_r + */ + void saHpiFieldTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiFieldTable_context *row_ctx = (saHpiFieldTable_context *)rg->existing_row; + // saHpiFieldTable_context *undo_ctx = (saHpiFieldTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1804,7 +1797,6 @@ void saHpiFieldTable_set_undo( netsnmp_r + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiHotSwapEventLogTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiHotSwapEventLogTable.c ++++ openhpi-subagent-2.3.4/src/saHpiHotSwapEventLogTable.c +@@ -103,7 +103,6 @@ SaErrorT populate_saHpiHotSwapEventLogTa + oid * this_child_oid, + size_t *this_child_oid_len) + { +- SaErrorT rv = SA_OK; + + oid hotswap_evt_oid[HOTSWAP_EVENT_LOG_INDEX_NR]; + netsnmp_index hotswap_evt_idx; +@@ -155,7 +154,7 @@ SaErrorT populate_saHpiHotSwapEventLogTa + /* create full oid on This row for parent RowPointer */ + column[0] = 1; + column[1] = COLUMN_SAHPIHOTSWAPEVENTLOGTIMESTAMP; +- memset(this_child_oid, 0, sizeof(this_child_oid)); ++ memset(this_child_oid, 0, MAX_OID_LEN); + build_full_oid(saHpiHotSwapEventLogTable_oid, saHpiHotSwapEventLogTable_oid_len, + column, column_len, + &hotswap_evt_idx, +@@ -176,7 +175,7 @@ SaErrorT populate_saHpiHotSwapEventLogTa + + if (!hotswap_evt_ctx) { + snmp_log (LOG_ERR, "Not enough memory for a Hot Swap Event Log row!"); +- rv = AGENT_ERR_INTERNAL_ERROR; ++ return AGENT_ERR_INTERNAL_ERROR; + } + + /** SaHpiTime = ASN_OCTET_STR */ +@@ -219,7 +218,6 @@ SaErrorT hotswap_event_log_clear(SaHpiSe + { + oid hotswap_evt_oid[HOTSWAP_EVENT_LOG_INDEX_NR]; + netsnmp_index hotswap_evt_idx; +- netsnmp_index *hotswap_index; + saHpiHotSwapEventLogTable_context *hotswap_evt_ctx; + + DR_XREF *dr_entry; +@@ -250,7 +248,7 @@ SaErrorT hotswap_event_log_clear(SaHpiSe + /* assign the indices to the index */ + hotswap_evt_idx.oids = (oid *) & hotswap_evt_oid; + +- hotswap_index = CONTAINER_FIRST(cb.container); ++ CONTAINER_FIRST(cb.container); + hotswap_evt_ctx = CONTAINER_FIND(cb.container, &hotswap_evt_idx); + + if (!hotswap_evt_ctx) { +@@ -843,7 +841,6 @@ void saHpiHotSwapEventLogTable_set_reser + // (saHpiHotSwapEventLogTable_context *)rg->existing_row; + // saHpiHotSwapEventLogTable_context *undo_ctx = + // (saHpiHotSwapEventLogTable_context *)rg->undo_info; +- netsnmp_variable_list *var; + netsnmp_request_group_item *current; + int rc; + +@@ -856,7 +853,6 @@ void saHpiHotSwapEventLogTable_set_reser + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -883,7 +879,6 @@ void saHpiHotSwapEventLogTable_set_reser + // saHpiHotSwapEventLogTable_context *row_ctx = (saHpiHotSwapEventLogTable_context *)rg->existing_row; + // saHpiHotSwapEventLogTable_context *undo_ctx = (saHpiHotSwapEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +- netsnmp_variable_list *var; + int rc; + + rg->rg_void = rg->list->ri; +@@ -894,7 +889,6 @@ void saHpiHotSwapEventLogTable_set_reser + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -926,7 +920,6 @@ void saHpiHotSwapEventLogTable_set_reser + */ + void saHpiHotSwapEventLogTable_set_action( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiHotSwapEventLogTable_context *row_ctx = (saHpiHotSwapEventLogTable_context *)rg->existing_row; + // saHpiHotSwapEventLogTable_context *undo_ctx = (saHpiHotSwapEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -941,7 +934,6 @@ void saHpiHotSwapEventLogTable_set_actio + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -982,7 +974,6 @@ void saHpiHotSwapEventLogTable_set_actio + */ + void saHpiHotSwapEventLogTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiHotSwapEventLogTable_context *row_ctx = (saHpiHotSwapEventLogTable_context *)rg->existing_row; + // saHpiHotSwapEventLogTable_context *undo_ctx = (saHpiHotSwapEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -992,7 +983,6 @@ void saHpiHotSwapEventLogTable_set_commi + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1017,7 +1007,6 @@ void saHpiHotSwapEventLogTable_set_commi + */ + void saHpiHotSwapEventLogTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiHotSwapEventLogTable_context *row_ctx = (saHpiHotSwapEventLogTable_context *)rg->existing_row; + // saHpiHotSwapEventLogTable_context *undo_ctx = (saHpiHotSwapEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1027,7 +1016,6 @@ void saHpiHotSwapEventLogTable_set_free( + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1063,7 +1051,6 @@ void saHpiHotSwapEventLogTable_set_free( + */ + void saHpiHotSwapEventLogTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiHotSwapEventLogTable_context *row_ctx = (saHpiHotSwapEventLogTable_context *)rg->existing_row; + // saHpiHotSwapEventLogTable_context *undo_ctx = (saHpiHotSwapEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1073,7 +1060,6 @@ void saHpiHotSwapEventLogTable_set_undo( + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiHotSwapEventTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiHotSwapEventTable.c ++++ openhpi-subagent-2.3.4/src/saHpiHotSwapEventTable.c +@@ -103,7 +103,6 @@ SaErrorT populate_saHpiHotSwapEventTable + oid * this_child_oid, + size_t *this_child_oid_len) + { +- SaErrorT rv = SA_OK; + int new_row = MIB_FALSE; + + oid hotswap_evt_oid[HOTSWAP_EVENT_INDEX_NR]; +@@ -161,7 +160,7 @@ SaErrorT populate_saHpiHotSwapEventTable + } + if (!hotswap_evt_ctx) { + snmp_log (LOG_ERR, "Not enough memory for a HotSwap Event row!"); +- rv = AGENT_ERR_INTERNAL_ERROR; ++ return AGENT_ERR_INTERNAL_ERROR; + } + + /** SaHpiEntryId = ASN_UNSIGNED */ +@@ -187,7 +186,7 @@ SaErrorT populate_saHpiHotSwapEventTable + /* create full oid on This row for parent RowPointer */ + column[0] = 1; + column[1] = COLUMN_SAHPIHOTSWAPEVENTTIMESTAMP; +- memset(this_child_oid, 0, sizeof(this_child_oid)); ++ memset(this_child_oid, 0, MAX_OID_LEN); + build_full_oid(saHpiHotSwapEventTable_oid, saHpiHotSwapEventTable_oid_len, + column, column_len, + &hotswap_evt_idx, +@@ -206,7 +205,6 @@ SaErrorT async_hotswap_event_add(SaHpiSe + oid * this_child_oid, + size_t *this_child_oid_len) + { +- SaErrorT rv = SA_OK; + int new_row = MIB_FALSE; + + oid hotswap_evt_oid[HOTSWAP_EVENT_INDEX_NR]; +@@ -274,7 +272,7 @@ SaErrorT async_hotswap_event_add(SaHpiSe + } + if (!hotswap_evt_ctx) { + snmp_log (LOG_ERR, "Not enough memory for a HotSwap Event row!"); +- rv = AGENT_ERR_INTERNAL_ERROR; ++ return AGENT_ERR_INTERNAL_ERROR; + } + + /** SaHpiEntryId = ASN_UNSIGNED */ +@@ -300,7 +298,7 @@ SaErrorT async_hotswap_event_add(SaHpiSe + /* create full oid on This row for parent RowPointer */ + column[0] = 1; + column[1] = COLUMN_SAHPIHOTSWAPEVENTTIMESTAMP; +- memset(this_child_oid, 0, sizeof(this_child_oid)); ++ memset(this_child_oid, 0, MAX_OID_LEN); + build_full_oid(saHpiHotSwapEventTable_oid, saHpiHotSwapEventTable_oid_len, + column, column_len, + &hotswap_evt_idx, +@@ -872,7 +870,6 @@ void saHpiHotSwapEventTable_set_reserve1 + // (saHpiHotSwapEventTable_context *)rg->existing_row; + // saHpiHotSwapEventTable_context *undo_ctx = + // (saHpiHotSwapEventTable_context *)rg->undo_info; +- netsnmp_variable_list *var; + netsnmp_request_group_item *current; + int rc; + +@@ -885,7 +882,6 @@ void saHpiHotSwapEventTable_set_reserve1 + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -912,7 +908,6 @@ void saHpiHotSwapEventTable_set_reserve2 + // saHpiHotSwapEventTable_context *row_ctx = (saHpiHotSwapEventTable_context *)rg->existing_row; + // saHpiHotSwapEventTable_context *undo_ctx = (saHpiHotSwapEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +- netsnmp_variable_list *var; + int rc; + + rg->rg_void = rg->list->ri; +@@ -923,7 +918,6 @@ void saHpiHotSwapEventTable_set_reserve2 + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -955,7 +949,6 @@ void saHpiHotSwapEventTable_set_reserve2 + */ + void saHpiHotSwapEventTable_set_action( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiHotSwapEventTable_context *row_ctx = (saHpiHotSwapEventTable_context *)rg->existing_row; + // saHpiHotSwapEventTable_context *undo_ctx = (saHpiHotSwapEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -970,7 +963,6 @@ void saHpiHotSwapEventTable_set_action( + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1011,7 +1003,6 @@ void saHpiHotSwapEventTable_set_action( + */ + void saHpiHotSwapEventTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiHotSwapEventTable_context *row_ctx = (saHpiHotSwapEventTable_context *)rg->existing_row; + // saHpiHotSwapEventTable_context *undo_ctx = (saHpiHotSwapEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1021,7 +1012,6 @@ void saHpiHotSwapEventTable_set_commit( + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1046,7 +1036,6 @@ void saHpiHotSwapEventTable_set_commit( + */ + void saHpiHotSwapEventTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiHotSwapEventTable_context *row_ctx = (saHpiHotSwapEventTable_context *)rg->existing_row; + // saHpiHotSwapEventTable_context *undo_ctx = (saHpiHotSwapEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1056,7 +1045,6 @@ void saHpiHotSwapEventTable_set_free( ne + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1092,7 +1080,6 @@ void saHpiHotSwapEventTable_set_free( ne + */ + void saHpiHotSwapEventTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiHotSwapEventTable_context *row_ctx = (saHpiHotSwapEventTable_context *)rg->existing_row; + // saHpiHotSwapEventTable_context *undo_ctx = (saHpiHotSwapEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1102,7 +1089,6 @@ void saHpiHotSwapEventTable_set_undo( ne + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiHotSwapTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiHotSwapTable.c ++++ openhpi-subagent-2.3.4/src/saHpiHotSwapTable.c +@@ -1255,7 +1255,6 @@ void saHpiHotSwapTable_set_action( netsn + */ + void saHpiHotSwapTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiHotSwapTable_context *row_ctx = (saHpiHotSwapTable_context *)rg->existing_row; + // saHpiHotSwapTable_context *undo_ctx = (saHpiHotSwapTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1267,7 +1266,6 @@ void saHpiHotSwapTable_set_commit( netsn + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1316,7 +1314,6 @@ void saHpiHotSwapTable_set_commit( netsn + */ + void saHpiHotSwapTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiHotSwapTable_context *row_ctx = (saHpiHotSwapTable_context *)rg->existing_row; + // saHpiHotSwapTable_context *undo_ctx = (saHpiHotSwapTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1328,7 +1325,6 @@ void saHpiHotSwapTable_set_free( netsnmp + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1388,7 +1384,6 @@ void saHpiHotSwapTable_set_free( netsnmp + */ + void saHpiHotSwapTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiHotSwapTable_context *row_ctx = (saHpiHotSwapTable_context *)rg->existing_row; + // saHpiHotSwapTable_context *undo_ctx = (saHpiHotSwapTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1400,7 +1395,6 @@ void saHpiHotSwapTable_set_undo( netsnmp + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiInventoryTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiInventoryTable.c ++++ openhpi-subagent-2.3.4/src/saHpiInventoryTable.c +@@ -844,7 +844,6 @@ void saHpiInventoryTable_set_reserve1( n + // (saHpiInventoryTable_context *)rg->existing_row; + // saHpiInventoryTable_context *undo_ctx = + // (saHpiInventoryTable_context *)rg->undo_info; +- netsnmp_variable_list *var; + netsnmp_request_group_item *current; + int rc; + +@@ -858,7 +857,6 @@ void saHpiInventoryTable_set_reserve1( n + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -885,7 +883,6 @@ void saHpiInventoryTable_set_reserve2( n + // saHpiInventoryTable_context *row_ctx = (saHpiInventoryTable_context *)rg->existing_row; + // saHpiInventoryTable_context *undo_ctx = (saHpiInventoryTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +- netsnmp_variable_list *var; + int rc; + + DEBUGMSGTL ((AGENT, "saHpiInventoryTable_set_reserve2, called\n")); +@@ -898,7 +895,6 @@ void saHpiInventoryTable_set_reserve2( n + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -930,7 +926,6 @@ void saHpiInventoryTable_set_reserve2( n + */ + void saHpiInventoryTable_set_action( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiInventoryTable_context *row_ctx = (saHpiInventoryTable_context *)rg->existing_row; + // saHpiInventoryTable_context *undo_ctx = (saHpiInventoryTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -946,7 +941,6 @@ void saHpiInventoryTable_set_action( net + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -983,7 +977,6 @@ void saHpiInventoryTable_set_action( net + */ + void saHpiInventoryTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiInventoryTable_context *row_ctx = (saHpiInventoryTable_context *)rg->existing_row; + // saHpiInventoryTable_context *undo_ctx = (saHpiInventoryTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -995,7 +988,6 @@ void saHpiInventoryTable_set_commit( net + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1020,7 +1012,6 @@ void saHpiInventoryTable_set_commit( net + */ + void saHpiInventoryTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiInventoryTable_context *row_ctx = (saHpiInventoryTable_context *)rg->existing_row; + // saHpiInventoryTable_context *undo_ctx = (saHpiInventoryTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1032,7 +1023,6 @@ void saHpiInventoryTable_set_free( netsn + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1069,7 +1059,6 @@ void saHpiInventoryTable_set_free( netsn + */ + void saHpiInventoryTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiInventoryTable_context *row_ctx = (saHpiInventoryTable_context *)rg->existing_row; + // saHpiInventoryTable_context *undo_ctx = (saHpiInventoryTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1081,7 +1070,6 @@ void saHpiInventoryTable_set_undo( netsn + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiOemEventLogTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiOemEventLogTable.c ++++ openhpi-subagent-2.3.4/src/saHpiOemEventLogTable.c +@@ -102,7 +102,6 @@ SaErrorT populate_saHpiOemEventLogTable( + oid * this_child_oid, + size_t *this_child_oid_len) + { +- SaErrorT rv = SA_OK; + + oid oem_evt_oid[Oem_EVENT_LOG_INDEX_NR]; + netsnmp_index oem_evt_idx; +@@ -154,7 +153,7 @@ SaErrorT populate_saHpiOemEventLogTable( + /* create full oid on This row for parent RowPointer */ + column[0] = 1; + column[1] = COLUMN_SAHPIOemEVENTLOGTIMESTAMP; +- memset(this_child_oid, 0, sizeof(this_child_oid)); ++ memset(this_child_oid, 0, MAX_OID_LEN); + build_full_oid(saHpiOemEventLogTable_oid, saHpiOemEventLogTable_oid_len, + column, column_len, + &oem_evt_idx, +@@ -175,7 +174,7 @@ SaErrorT populate_saHpiOemEventLogTable( + + if (!oem_evt_ctx) { + snmp_log (LOG_ERR, "Not enough memory for an Oem Event Log row!"); +- rv = AGENT_ERR_INTERNAL_ERROR; ++ return AGENT_ERR_INTERNAL_ERROR; + } + + +@@ -231,7 +230,6 @@ SaErrorT oem_event_log_clear(SaHpiSessio + { + oid oem_evt_oid[Oem_EVENT_LOG_INDEX_NR]; + netsnmp_index oem_evt_idx; +- netsnmp_index *oem_index; + saHpiOemEventLogTable_context *oem_evt_ctx; + + DR_XREF *dr_entry; +@@ -262,7 +260,7 @@ SaErrorT oem_event_log_clear(SaHpiSessio + /* assign the indices to the index */ + oem_evt_idx.oids = (oid *) & oem_evt_oid; + +- oem_index = CONTAINER_FIRST(cb.container); ++ CONTAINER_FIRST(cb.container); + oem_evt_ctx = CONTAINER_FIND(cb.container, &oem_evt_idx); + + if (!oem_evt_ctx) { +@@ -865,7 +863,6 @@ void saHpiOemEventLogTable_set_reserve1( + // (saHpiOemEventLogTable_context *)rg->existing_row; + // saHpiOemEventLogTable_context *undo_ctx = + // (saHpiOemEventLogTable_context *)rg->undo_info; +- netsnmp_variable_list *var; + netsnmp_request_group_item *current; + int rc; + +@@ -878,7 +875,6 @@ void saHpiOemEventLogTable_set_reserve1( + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -905,7 +901,6 @@ void saHpiOemEventLogTable_set_reserve2( + // saHpiOemEventLogTable_context *row_ctx = (saHpiOemEventLogTable_context *)rg->existing_row; + // saHpiOemEventLogTable_context *undo_ctx = (saHpiOemEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +- netsnmp_variable_list *var; + int rc; + + rg->rg_void = rg->list->ri; +@@ -916,7 +911,6 @@ void saHpiOemEventLogTable_set_reserve2( + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -948,7 +942,6 @@ void saHpiOemEventLogTable_set_reserve2( + */ + void saHpiOemEventLogTable_set_action( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiOemEventLogTable_context *row_ctx = (saHpiOemEventLogTable_context *)rg->existing_row; + // saHpiOemEventLogTable_context *undo_ctx = (saHpiOemEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -962,7 +955,6 @@ void saHpiOemEventLogTable_set_action( n + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1002,7 +994,6 @@ void saHpiOemEventLogTable_set_action( n + */ + void saHpiOemEventLogTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiOemEventLogTable_context *row_ctx = (saHpiOemEventLogTable_context *)rg->existing_row; + // saHpiOemEventLogTable_context *undo_ctx = (saHpiOemEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1012,7 +1003,6 @@ void saHpiOemEventLogTable_set_commit( n + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1037,7 +1027,6 @@ void saHpiOemEventLogTable_set_commit( n + */ + void saHpiOemEventLogTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiOemEventLogTable_context *row_ctx = (saHpiOemEventLogTable_context *)rg->existing_row; + // saHpiOemEventLogTable_context *undo_ctx = (saHpiOemEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1047,7 +1036,6 @@ void saHpiOemEventLogTable_set_free( net + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1083,7 +1071,6 @@ void saHpiOemEventLogTable_set_free( net + */ + void saHpiOemEventLogTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiOemEventLogTable_context *row_ctx = (saHpiOemEventLogTable_context *)rg->existing_row; + // saHpiOemEventLogTable_context *undo_ctx = (saHpiOemEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1093,7 +1080,6 @@ void saHpiOemEventLogTable_set_undo( net + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiOemEventTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiOemEventTable.c ++++ openhpi-subagent-2.3.4/src/saHpiOemEventTable.c +@@ -104,7 +104,6 @@ SaErrorT populate_saHpiOemEventTable(SaH + oid * this_child_oid, + size_t *this_child_oid_len) + { +- SaErrorT rv = SA_OK; + int new_row = MIB_FALSE; + + oid oem_evt_oid[Oem_EVENT_INDEX_NR]; +@@ -162,7 +161,7 @@ SaErrorT populate_saHpiOemEventTable(SaH + } + if (!oem_evt_ctx) { + snmp_log (LOG_ERR, "Not enough memory for a Oem Event row!"); +- rv = AGENT_ERR_INTERNAL_ERROR; ++ return AGENT_ERR_INTERNAL_ERROR; + } + + /** SaHpiEntryId = ASN_UNSIGNED */ +@@ -200,7 +199,7 @@ SaErrorT populate_saHpiOemEventTable(SaH + /* create full oid on This row for parent RowPointer */ + column[0] = 1; + column[1] = COLUMN_SAHPIOemEVENTTIMESTAMP; +- memset(this_child_oid, 0, sizeof(this_child_oid)); ++ memset(this_child_oid, 0, MAX_OID_LEN); + build_full_oid(saHpiOemEventTable_oid, saHpiOemEventTable_oid_len, + column, column_len, + &oem_evt_idx, +@@ -219,7 +218,6 @@ SaErrorT async_oem_event_add(SaHpiSessio + oid * this_child_oid, + size_t *this_child_oid_len) + { +- SaErrorT rv = SA_OK; + int new_row = MIB_FALSE; + + oid oem_evt_oid[Oem_EVENT_INDEX_NR]; +@@ -286,7 +284,7 @@ SaErrorT async_oem_event_add(SaHpiSessio + } + if (!oem_evt_ctx) { + snmp_log (LOG_ERR, "Not enough memory for a Oem Event row!"); +- rv = AGENT_ERR_INTERNAL_ERROR; ++ return AGENT_ERR_INTERNAL_ERROR; + } + + /** SaHpiEntryId = ASN_UNSIGNED */ +@@ -324,7 +322,7 @@ SaErrorT async_oem_event_add(SaHpiSessio + /* create full oid on This row for parent RowPointer */ + column[0] = 1; + column[1] = COLUMN_SAHPIOemEVENTTIMESTAMP; +- memset(this_child_oid, 0, sizeof(this_child_oid)); ++ memset(this_child_oid, 0, MAX_OID_LEN); + build_full_oid(saHpiOemEventTable_oid, saHpiOemEventTable_oid_len, + column, column_len, + &oem_evt_idx, +@@ -903,7 +901,6 @@ void saHpiOemEventTable_set_reserve1( ne + // (saHpiOemEventTable_context *)rg->existing_row; + // saHpiOemEventTable_context *undo_ctx = + // (saHpiOemEventTable_context *)rg->undo_info; +- netsnmp_variable_list *var; + netsnmp_request_group_item *current; + int rc; + +@@ -916,7 +913,6 @@ void saHpiOemEventTable_set_reserve1( ne + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -943,7 +939,6 @@ void saHpiOemEventTable_set_reserve2( ne + // saHpiOemEventTable_context *row_ctx = (saHpiOemEventTable_context *)rg->existing_row; + // saHpiOemEventTable_context *undo_ctx = (saHpiOemEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +- netsnmp_variable_list *var; + int rc; + + rg->rg_void = rg->list->ri; +@@ -954,7 +949,6 @@ void saHpiOemEventTable_set_reserve2( ne + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -986,7 +980,6 @@ void saHpiOemEventTable_set_reserve2( ne + */ + void saHpiOemEventTable_set_action( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiOemEventTable_context *row_ctx = (saHpiOemEventTable_context *)rg->existing_row; + // saHpiOemEventTable_context *undo_ctx = (saHpiOemEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1000,7 +993,6 @@ void saHpiOemEventTable_set_action( nets + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1041,7 +1033,6 @@ void saHpiOemEventTable_set_action( nets + */ + void saHpiOemEventTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiOemEventTable_context *row_ctx = (saHpiOemEventTable_context *)rg->existing_row; + // saHpiOemEventTable_context *undo_ctx = (saHpiOemEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1051,7 +1042,6 @@ void saHpiOemEventTable_set_commit( nets + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1076,7 +1066,6 @@ void saHpiOemEventTable_set_commit( nets + */ + void saHpiOemEventTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiOemEventTable_context *row_ctx = (saHpiOemEventTable_context *)rg->existing_row; + // saHpiOemEventTable_context *undo_ctx = (saHpiOemEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1086,7 +1075,6 @@ void saHpiOemEventTable_set_free( netsnm + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1122,7 +1110,6 @@ void saHpiOemEventTable_set_free( netsnm + */ + void saHpiOemEventTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiOemEventTable_context *row_ctx = (saHpiOemEventTable_context *)rg->existing_row; + // saHpiOemEventTable_context *undo_ctx = (saHpiOemEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1132,7 +1119,6 @@ void saHpiOemEventTable_set_undo( netsnm + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiRdrTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiRdrTable.c ++++ openhpi-subagent-2.3.4/src/saHpiRdrTable.c +@@ -1074,7 +1074,6 @@ void saHpiRdrTable_set_reserve1( netsnmp + // (saHpiRdrTable_context *)rg->existing_row; + // saHpiRdrTable_context *undo_ctx = + // (saHpiRdrTable_context *)rg->undo_info; +- netsnmp_variable_list *var; + netsnmp_request_group_item *current; + int rc; + +@@ -1088,7 +1087,6 @@ void saHpiRdrTable_set_reserve1( netsnmp + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -1115,7 +1113,6 @@ void saHpiRdrTable_set_reserve2( netsnmp + // saHpiRdrTable_context *row_ctx = (saHpiRdrTable_context *)rg->existing_row; + // saHpiRdrTable_context *undo_ctx = (saHpiRdrTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +- netsnmp_variable_list *var; + int rc; + + DEBUGMSGTL ((AGENT, "saHpiRdrTable_set_reserve2, called\n")); +@@ -1128,7 +1125,6 @@ void saHpiRdrTable_set_reserve2( netsnmp + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -1160,7 +1156,6 @@ void saHpiRdrTable_set_reserve2( netsnmp + */ + void saHpiRdrTable_set_action( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiRdrTable_context *row_ctx = (saHpiRdrTable_context *)rg->existing_row; + // saHpiRdrTable_context *undo_ctx = (saHpiRdrTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1176,7 +1171,6 @@ void saHpiRdrTable_set_action( netsnmp_r + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1213,7 +1207,6 @@ void saHpiRdrTable_set_action( netsnmp_r + */ + void saHpiRdrTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiRdrTable_context *row_ctx = (saHpiRdrTable_context *)rg->existing_row; + // saHpiRdrTable_context *undo_ctx = (saHpiRdrTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1225,7 +1218,6 @@ void saHpiRdrTable_set_commit( netsnmp_r + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1250,7 +1242,6 @@ void saHpiRdrTable_set_commit( netsnmp_r + */ + void saHpiRdrTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiRdrTable_context *row_ctx = (saHpiRdrTable_context *)rg->existing_row; + // saHpiRdrTable_context *undo_ctx = (saHpiRdrTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1262,7 +1253,6 @@ void saHpiRdrTable_set_free( netsnmp_req + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1299,7 +1289,6 @@ void saHpiRdrTable_set_free( netsnmp_req + */ + void saHpiRdrTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiRdrTable_context *row_ctx = (saHpiRdrTable_context *)rg->existing_row; + // saHpiRdrTable_context *undo_ctx = (saHpiRdrTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1311,7 +1300,6 @@ void saHpiRdrTable_set_undo( netsnmp_req + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiResourceEventLogTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiResourceEventLogTable.c ++++ openhpi-subagent-2.3.4/src/saHpiResourceEventLogTable.c +@@ -112,7 +112,6 @@ SaErrorT populate_saHpiResourceEventLogT + oid * this_child_oid, + size_t *this_child_oid_len) + { +- SaErrorT rv = SA_OK; + + oid res_evt_oid[RESOURCE_EVENT_LOG_INDEX_NR]; + netsnmp_index res_evt_idx; +@@ -160,7 +159,7 @@ SaErrorT populate_saHpiResourceEventLogT + /* create full oid on This row for parent RowPointer */ + column[0] = 1; + column[1] = COLUMN_SAHPIRESOURCEEVENTLOGTIMESTAMP; +- memset(this_child_oid, 0, sizeof(this_child_oid)); ++ memset(this_child_oid, 0, sizeof(*this_child_oid)); + build_full_oid(saHpiResourceEventLogTable_oid, saHpiResourceEventLogTable_oid_len, + column, column_len, + &res_evt_idx, +@@ -180,7 +179,7 @@ SaErrorT populate_saHpiResourceEventLogT + } + if (!res_evt_ctx) { + snmp_log (LOG_ERR, "Not enough memory for a Resource Event Log row!"); +- rv = AGENT_ERR_INTERNAL_ERROR; ++ return AGENT_ERR_INTERNAL_ERROR; + } + + /** SaHpiEntryId = ASN_UNSIGNED */ +@@ -222,7 +221,6 @@ SaErrorT resource_event_log_clear(SaHpiS + { + oid res_evt_oid[RESOURCE_EVENT_LOG_INDEX_NR]; + netsnmp_index res_evt_idx; +- netsnmp_index *res_index; + saHpiResourceEventLogTable_context *res_evt_ctx; + + DR_XREF *dr_entry; +@@ -252,7 +250,7 @@ SaErrorT resource_event_log_clear(SaHpiS + /* assign the indices to the index */ + res_evt_idx.oids = (oid *) & res_evt_oid; + +- res_index = CONTAINER_FIRST(cb.container); ++ CONTAINER_FIRST(cb.container); + res_evt_ctx = CONTAINER_FIND(cb.container, &res_evt_idx); + + if (!res_evt_ctx) { +@@ -857,7 +855,6 @@ void saHpiResourceEventLogTable_set_rese + // (saHpiResourceEventLogTable_context *)rg->existing_row; + // saHpiResourceEventLogTable_context *undo_ctx = + // (saHpiResourceEventLogTable_context *)rg->undo_info; +- netsnmp_variable_list *var; + netsnmp_request_group_item *current; + int rc; + +@@ -871,7 +868,6 @@ void saHpiResourceEventLogTable_set_rese + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -898,7 +894,6 @@ void saHpiResourceEventLogTable_set_rese + // saHpiResourceEventLogTable_context *row_ctx = (saHpiResourceEventLogTable_context *)rg->existing_row; + // saHpiResourceEventLogTable_context *undo_ctx = (saHpiResourceEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +- netsnmp_variable_list *var; + int rc; + + DEBUGMSGTL ((AGENT, "saHpiResourceEventLogTable_set_reserve2, called\n")); +@@ -911,7 +906,6 @@ void saHpiResourceEventLogTable_set_rese + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -943,7 +937,6 @@ void saHpiResourceEventLogTable_set_rese + */ + void saHpiResourceEventLogTable_set_action( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiResourceEventLogTable_context *row_ctx = (saHpiResourceEventLogTable_context *)rg->existing_row; + // saHpiResourceEventLogTable_context *undo_ctx = (saHpiResourceEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -959,7 +952,6 @@ void saHpiResourceEventLogTable_set_acti + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -995,7 +987,6 @@ void saHpiResourceEventLogTable_set_acti + */ + void saHpiResourceEventLogTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiResourceEventLogTable_context *row_ctx = (saHpiResourceEventLogTable_context *)rg->existing_row; + // saHpiResourceEventLogTable_context *undo_ctx = (saHpiResourceEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1007,7 +998,6 @@ void saHpiResourceEventLogTable_set_comm + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1032,7 +1022,6 @@ void saHpiResourceEventLogTable_set_comm + */ + void saHpiResourceEventLogTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiResourceEventLogTable_context *row_ctx = (saHpiResourceEventLogTable_context *)rg->existing_row; + // saHpiResourceEventLogTable_context *undo_ctx = (saHpiResourceEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1044,7 +1033,6 @@ void saHpiResourceEventLogTable_set_free + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1081,7 +1069,6 @@ void saHpiResourceEventLogTable_set_free + */ + void saHpiResourceEventLogTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiResourceEventLogTable_context *row_ctx = (saHpiResourceEventLogTable_context *)rg->existing_row; + // saHpiResourceEventLogTable_context *undo_ctx = (saHpiResourceEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1093,7 +1080,6 @@ void saHpiResourceEventLogTable_set_undo + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiResourceEventTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiResourceEventTable.c ++++ openhpi-subagent-2.3.4/src/saHpiResourceEventTable.c +@@ -105,7 +105,6 @@ SaErrorT populate_saHpiResourceEventTabl + oid * this_child_oid, + size_t *this_child_oid_len) + { +- SaErrorT rv = SA_OK; + int new_row = MIB_FALSE; + + oid res_evt_oid[RESOURCE_EVENT_INDEX_NR]; +@@ -157,7 +156,7 @@ SaErrorT populate_saHpiResourceEventTabl + /* create full oid on This row for parent RowPointer */ + column[0] = 1; + column[1] = COLUMN_SAHPIRESOURCEEVENTTIMESTAMP; +- memset(this_child_oid, 0, sizeof(this_child_oid)); ++ memset(this_child_oid, 0, sizeof(*this_child_oid)); + build_full_oid(saHpiResourceEventTable_oid, saHpiResourceEventTable_oid_len, + column, column_len, + &res_evt_idx, +@@ -176,7 +175,6 @@ SaErrorT populate_saHpiResourceEventTabl + } + if (!res_evt_ctx) { + snmp_log (LOG_ERR, "Not enough memory for a Resource Event row!"); +- rv = AGENT_ERR_INTERNAL_ERROR; + } + + /** SaHpiEntryId = ASN_UNSIGNED */ +@@ -206,7 +204,6 @@ SaErrorT async_resource_event_add(SaHpiS + oid * this_child_oid, + size_t *this_child_oid_len) + { +- SaErrorT rv = SA_OK; + int new_row = MIB_FALSE; + + oid res_evt_oid[RESOURCE_EVENT_INDEX_NR]; +@@ -255,7 +252,7 @@ SaErrorT async_resource_event_add(SaHpiS + /* create full oid on This row for parent RowPointer */ + column[0] = 1; + column[1] = COLUMN_SAHPIRESOURCEEVENTTIMESTAMP; +- memset(this_child_oid, 0, sizeof(this_child_oid)); ++ memset(this_child_oid, 0, sizeof(*this_child_oid)); + build_full_oid(saHpiResourceEventTable_oid, saHpiResourceEventTable_oid_len, + column, column_len, + &res_evt_idx, +@@ -274,7 +271,6 @@ SaErrorT async_resource_event_add(SaHpiS + } + if (!res_evt_ctx) { + snmp_log (LOG_ERR, "Not enough memory for a Resource Event row!"); +- rv = AGENT_ERR_INTERNAL_ERROR; + } + + /** SaHpiEntryId = ASN_UNSIGNED */ +@@ -867,7 +863,6 @@ void saHpiResourceEventTable_set_reserve + // (saHpiResourceEventTable_context *)rg->existing_row; + // saHpiResourceEventTable_context *undo_ctx = + // (saHpiResourceEventTable_context *)rg->undo_info; +- netsnmp_variable_list *var; + netsnmp_request_group_item *current; + int rc; + +@@ -881,7 +876,6 @@ void saHpiResourceEventTable_set_reserve + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -908,7 +902,6 @@ void saHpiResourceEventTable_set_reserve + // saHpiResourceEventTable_context *row_ctx = (saHpiResourceEventTable_context *)rg->existing_row; + // saHpiResourceEventTable_context *undo_ctx = (saHpiResourceEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +- netsnmp_variable_list *var; + int rc; + + DEBUGMSGTL ((AGENT, "saHpiResourceEventTable_set_reserve2, called\n")); +@@ -921,7 +914,6 @@ void saHpiResourceEventTable_set_reserve + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -953,7 +945,6 @@ void saHpiResourceEventTable_set_reserve + */ + void saHpiResourceEventTable_set_action( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiResourceEventTable_context *row_ctx = (saHpiResourceEventTable_context *)rg->existing_row; + // saHpiResourceEventTable_context *undo_ctx = (saHpiResourceEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -969,7 +960,6 @@ void saHpiResourceEventTable_set_action( + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1005,7 +995,6 @@ void saHpiResourceEventTable_set_action( + */ + void saHpiResourceEventTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiResourceEventTable_context *row_ctx = (saHpiResourceEventTable_context *)rg->existing_row; + // saHpiResourceEventTable_context *undo_ctx = (saHpiResourceEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1017,7 +1006,6 @@ void saHpiResourceEventTable_set_commit( + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1042,7 +1030,6 @@ void saHpiResourceEventTable_set_commit( + */ + void saHpiResourceEventTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiResourceEventTable_context *row_ctx = (saHpiResourceEventTable_context *)rg->existing_row; + // saHpiResourceEventTable_context *undo_ctx = (saHpiResourceEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1054,7 +1041,6 @@ void saHpiResourceEventTable_set_free( n + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1091,7 +1077,6 @@ void saHpiResourceEventTable_set_free( n + */ + void saHpiResourceEventTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiResourceEventTable_context *row_ctx = (saHpiResourceEventTable_context *)rg->existing_row; + // saHpiResourceEventTable_context *undo_ctx = (saHpiResourceEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1103,7 +1088,6 @@ void saHpiResourceEventTable_set_undo( n + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiResourceTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiResourceTable.c ++++ openhpi-subagent-2.3.4/src/saHpiResourceTable.c +@@ -1647,7 +1647,6 @@ void saHpiResourceTable_set_action( nets + */ + void saHpiResourceTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiResourceTable_context *row_ctx = (saHpiResourceTable_context *)rg->existing_row; + // saHpiResourceTable_context *undo_ctx = (saHpiResourceTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1659,7 +1658,6 @@ void saHpiResourceTable_set_commit( nets + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -1712,7 +1710,6 @@ void saHpiResourceTable_set_commit( nets + */ + void saHpiResourceTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiResourceTable_context *row_ctx = (saHpiResourceTable_context *)rg->existing_row; + // saHpiResourceTable_context *undo_ctx = (saHpiResourceTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1724,7 +1721,6 @@ void saHpiResourceTable_set_free( netsnm + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -1788,7 +1784,6 @@ void saHpiResourceTable_set_free( netsnm + */ + void saHpiResourceTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiResourceTable_context *row_ctx = (saHpiResourceTable_context *)rg->existing_row; + // saHpiResourceTable_context *undo_ctx = (saHpiResourceTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1800,7 +1795,6 @@ void saHpiResourceTable_set_undo( netsnm + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiSensorEnableChangeEventLogTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiSensorEnableChangeEventLogTable.c ++++ openhpi-subagent-2.3.4/src/saHpiSensorEnableChangeEventLogTable.c +@@ -104,7 +104,6 @@ SaErrorT populate_saHpiSensorEnableChang + oid * this_child_oid, + size_t *this_child_oid_len) + { +- SaErrorT rv = SA_OK; + + oid sec_evt_oid[SENSOR_ENABLE_CHANGE_EVENT_LOG_INDEX_NR]; + netsnmp_index sec_evt_idx; +@@ -159,7 +158,7 @@ SaErrorT populate_saHpiSensorEnableChang + /* create full oid on This row for parent RowPointer */ + column[0] = 1; + column[1] = COLUMN_SAHPISENSORENABLECHANGEEVENTLOGTIMESTAMP; +- memset(this_child_oid, 0, sizeof(this_child_oid)); ++ memset(this_child_oid, 0, MAX_OID_LEN); + build_full_oid(saHpiSensorEnableChangeEventLogTable_oid, saHpiSensorEnableChangeEventLogTable_oid_len, + column, column_len, + &sec_evt_idx, +@@ -180,7 +179,7 @@ SaErrorT populate_saHpiSensorEnableChang + + if (!sec_evt_ctx) { + snmp_log (LOG_ERR, "Not enough memory for a Sensor Enable Change Event Log row!"); +- rv = AGENT_ERR_INTERNAL_ERROR; ++ return AGENT_ERR_INTERNAL_ERROR; + } + + +@@ -347,7 +346,6 @@ SaErrorT sen_en_change_event_log_clear(S + { + oid sec_evt_oid[SENSOR_ENABLE_CHANGE_EVENT_LOG_INDEX_NR]; + netsnmp_index sec_evt_idx; +- netsnmp_index *sec_index; + saHpiSensorEnableChangeEventLogTable_context *sec_evt_ctx; + + DR_XREF *dr_entry; +@@ -380,7 +378,7 @@ SaErrorT sen_en_change_event_log_clear(S + /* assign the indices to the index */ + sec_evt_idx.oids = (oid *) & sec_evt_oid; + +- sec_index = CONTAINER_FIRST(cb.container); ++ CONTAINER_FIRST(cb.container); + sec_evt_ctx = CONTAINER_FIND(cb.container, &sec_evt_idx); + + if (!sec_evt_ctx) { +@@ -1012,7 +1010,6 @@ void saHpiSensorEnableChangeEventLogTabl + // (saHpiSensorEnableChangeEventLogTable_context *)rg->existing_row; + // saHpiSensorEnableChangeEventLogTable_context *undo_ctx = + // (saHpiSensorEnableChangeEventLogTable_context *)rg->undo_info; +- netsnmp_variable_list *var; + netsnmp_request_group_item *current; + int rc; + +@@ -1025,7 +1022,6 @@ void saHpiSensorEnableChangeEventLogTabl + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -1052,7 +1048,6 @@ void saHpiSensorEnableChangeEventLogTabl + // saHpiSensorEnableChangeEventLogTable_context *row_ctx = (saHpiSensorEnableChangeEventLogTable_context *)rg->existing_row; + // saHpiSensorEnableChangeEventLogTable_context *undo_ctx = (saHpiSensorEnableChangeEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +- netsnmp_variable_list *var; + int rc; + + rg->rg_void = rg->list->ri; +@@ -1063,7 +1058,6 @@ void saHpiSensorEnableChangeEventLogTabl + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -1095,7 +1089,6 @@ void saHpiSensorEnableChangeEventLogTabl + */ + void saHpiSensorEnableChangeEventLogTable_set_action( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorEnableChangeEventLogTable_context *row_ctx = (saHpiSensorEnableChangeEventLogTable_context *)rg->existing_row; + // saHpiSensorEnableChangeEventLogTable_context *undo_ctx = (saHpiSensorEnableChangeEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1109,7 +1102,6 @@ void saHpiSensorEnableChangeEventLogTabl + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1150,7 +1142,6 @@ void saHpiSensorEnableChangeEventLogTabl + */ + void saHpiSensorEnableChangeEventLogTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorEnableChangeEventLogTable_context *row_ctx = (saHpiSensorEnableChangeEventLogTable_context *)rg->existing_row; + // saHpiSensorEnableChangeEventLogTable_context *undo_ctx = (saHpiSensorEnableChangeEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1160,7 +1151,6 @@ void saHpiSensorEnableChangeEventLogTabl + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1185,7 +1175,6 @@ void saHpiSensorEnableChangeEventLogTabl + */ + void saHpiSensorEnableChangeEventLogTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorEnableChangeEventLogTable_context *row_ctx = (saHpiSensorEnableChangeEventLogTable_context *)rg->existing_row; + // saHpiSensorEnableChangeEventLogTable_context *undo_ctx = (saHpiSensorEnableChangeEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1195,7 +1184,6 @@ void saHpiSensorEnableChangeEventLogTabl + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1231,7 +1219,6 @@ void saHpiSensorEnableChangeEventLogTabl + */ + void saHpiSensorEnableChangeEventLogTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorEnableChangeEventLogTable_context *row_ctx = (saHpiSensorEnableChangeEventLogTable_context *)rg->existing_row; + // saHpiSensorEnableChangeEventLogTable_context *undo_ctx = (saHpiSensorEnableChangeEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1241,7 +1228,6 @@ void saHpiSensorEnableChangeEventLogTabl + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiSensorEnableChangeEventTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiSensorEnableChangeEventTable.c ++++ openhpi-subagent-2.3.4/src/saHpiSensorEnableChangeEventTable.c +@@ -104,7 +104,6 @@ SaErrorT populate_saHpiSensorEnableChang + oid * this_child_oid, + size_t *this_child_oid_len) + { +- SaErrorT rv = SA_OK; + int new_row = MIB_FALSE; + + oid sensor_enable_change_evt_oid[SENSOR_ENABLE_CHANGE_EVENT_INDEX_NR]; +@@ -167,7 +166,7 @@ SaErrorT populate_saHpiSensorEnableChang + } + if (!sensor_enable_change_evt_ctx) { + snmp_log (LOG_ERR, "Not enough memory for a Sensor Enable Change Event row!"); +- rv = AGENT_ERR_INTERNAL_ERROR; ++ return AGENT_ERR_INTERNAL_ERROR; + } + + /** SaHpiEntryId = ASN_UNSIGNED */ +@@ -335,7 +334,6 @@ SaErrorT async_sensor_enable_change_even + oid * this_child_oid, + size_t *this_child_oid_len) + { +- SaErrorT rv = SA_OK; + int new_row = MIB_FALSE; + + oid sensor_enable_change_evt_oid[SENSOR_ENABLE_CHANGE_EVENT_INDEX_NR]; +@@ -406,7 +404,7 @@ SaErrorT async_sensor_enable_change_even + } + if (!sensor_enable_change_evt_ctx) { + snmp_log (LOG_ERR, "Not enough memory for a Sensor Enable Change Event row!"); +- rv = AGENT_ERR_INTERNAL_ERROR; ++ return AGENT_ERR_INTERNAL_ERROR; + } + + /** SaHpiEntryId = ASN_UNSIGNED */ +@@ -1152,7 +1150,6 @@ void saHpiSensorEnableChangeEventTable_s + // (saHpiSensorEnableChangeEventTable_context *)rg->existing_row; + // saHpiSensorEnableChangeEventTable_context *undo_ctx = + // (saHpiSensorEnableChangeEventTable_context *)rg->undo_info; +- netsnmp_variable_list *var; + netsnmp_request_group_item *current; + int rc; + +@@ -1165,7 +1162,6 @@ void saHpiSensorEnableChangeEventTable_s + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -1192,7 +1188,6 @@ void saHpiSensorEnableChangeEventTable_s + // saHpiSensorEnableChangeEventTable_context *row_ctx = (saHpiSensorEnableChangeEventTable_context *)rg->existing_row; + // saHpiSensorEnableChangeEventTable_context *undo_ctx = (saHpiSensorEnableChangeEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +- netsnmp_variable_list *var; + int rc; + + rg->rg_void = rg->list->ri; +@@ -1203,7 +1198,6 @@ void saHpiSensorEnableChangeEventTable_s + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -1235,7 +1229,6 @@ void saHpiSensorEnableChangeEventTable_s + */ + void saHpiSensorEnableChangeEventTable_set_action( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorEnableChangeEventTable_context *row_ctx = (saHpiSensorEnableChangeEventTable_context *)rg->existing_row; + // saHpiSensorEnableChangeEventTable_context *undo_ctx = (saHpiSensorEnableChangeEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1249,7 +1242,6 @@ void saHpiSensorEnableChangeEventTable_s + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1291,7 +1283,6 @@ void saHpiSensorEnableChangeEventTable_s + */ + void saHpiSensorEnableChangeEventTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorEnableChangeEventTable_context *row_ctx = (saHpiSensorEnableChangeEventTable_context *)rg->existing_row; + // saHpiSensorEnableChangeEventTable_context *undo_ctx = (saHpiSensorEnableChangeEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1301,7 +1292,6 @@ void saHpiSensorEnableChangeEventTable_s + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1326,7 +1316,6 @@ void saHpiSensorEnableChangeEventTable_s + */ + void saHpiSensorEnableChangeEventTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorEnableChangeEventTable_context *row_ctx = (saHpiSensorEnableChangeEventTable_context *)rg->existing_row; + // saHpiSensorEnableChangeEventTable_context *undo_ctx = (saHpiSensorEnableChangeEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1336,7 +1325,6 @@ void saHpiSensorEnableChangeEventTable_s + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1372,7 +1360,6 @@ void saHpiSensorEnableChangeEventTable_s + */ + void saHpiSensorEnableChangeEventTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorEnableChangeEventTable_context *row_ctx = (saHpiSensorEnableChangeEventTable_context *)rg->existing_row; + // saHpiSensorEnableChangeEventTable_context *undo_ctx = (saHpiSensorEnableChangeEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1382,7 +1369,6 @@ void saHpiSensorEnableChangeEventTable_s + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiSensorEventLogTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiSensorEventLogTable.c ++++ openhpi-subagent-2.3.4/src/saHpiSensorEventLogTable.c +@@ -336,7 +336,6 @@ SaErrorT sensor_event_log_clear(SaHpiSes + + oid sen_evt_oid[SENSOR_EVENT_LOG_INDEX_NR]; + netsnmp_index sen_evt_idx; +- netsnmp_index *sensor_index; + saHpiSensorEventLogTable_context *sen_evt_ctx; + + DR_XREF *dr_entry; +@@ -369,7 +368,7 @@ SaErrorT sensor_event_log_clear(SaHpiSes + /* assign the indices to the index */ + sen_evt_idx.oids = (oid *) & sen_evt_oid; + +- sensor_index = CONTAINER_FIRST(cb.container); ++ CONTAINER_FIRST(cb.container); + sen_evt_ctx = CONTAINER_FIND(cb.container, &sen_evt_idx); + + if (!sen_evt_ctx) { +@@ -1000,7 +999,6 @@ void saHpiSensorEventLogTable_set_reserv + // (saHpiSensorEventLogTable_context *)rg->existing_row; + // saHpiSensorEventLogTable_context *undo_ctx = + // (saHpiSensorEventLogTable_context *)rg->undo_info; +- netsnmp_variable_list *var; + netsnmp_request_group_item *current; + int rc; + +@@ -1013,7 +1011,6 @@ void saHpiSensorEventLogTable_set_reserv + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -1040,7 +1037,6 @@ void saHpiSensorEventLogTable_set_reserv + // saHpiSensorEventLogTable_context *row_ctx = (saHpiSensorEventLogTable_context *)rg->existing_row; + // saHpiSensorEventLogTable_context *undo_ctx = (saHpiSensorEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +- netsnmp_variable_list *var; + int rc; + + rg->rg_void = rg->list->ri; +@@ -1051,7 +1047,6 @@ void saHpiSensorEventLogTable_set_reserv + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -1083,7 +1078,6 @@ void saHpiSensorEventLogTable_set_reserv + */ + void saHpiSensorEventLogTable_set_action( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorEventLogTable_context *row_ctx = (saHpiSensorEventLogTable_context *)rg->existing_row; + // saHpiSensorEventLogTable_context *undo_ctx = (saHpiSensorEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1097,7 +1091,6 @@ void saHpiSensorEventLogTable_set_action + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1133,7 +1126,6 @@ void saHpiSensorEventLogTable_set_action + */ + void saHpiSensorEventLogTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorEventLogTable_context *row_ctx = (saHpiSensorEventLogTable_context *)rg->existing_row; + // saHpiSensorEventLogTable_context *undo_ctx = (saHpiSensorEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1143,7 +1135,6 @@ void saHpiSensorEventLogTable_set_commit + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1168,7 +1159,6 @@ void saHpiSensorEventLogTable_set_commit + */ + void saHpiSensorEventLogTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorEventLogTable_context *row_ctx = (saHpiSensorEventLogTable_context *)rg->existing_row; + // saHpiSensorEventLogTable_context *undo_ctx = (saHpiSensorEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1178,7 +1168,6 @@ void saHpiSensorEventLogTable_set_free( + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1215,7 +1204,6 @@ void saHpiSensorEventLogTable_set_free( + */ + void saHpiSensorEventLogTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorEventLogTable_context *row_ctx = (saHpiSensorEventLogTable_context *)rg->existing_row; + // saHpiSensorEventLogTable_context *undo_ctx = (saHpiSensorEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1225,7 +1213,6 @@ void saHpiSensorEventLogTable_set_undo( + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiSensorEventTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiSensorEventTable.c ++++ openhpi-subagent-2.3.4/src/saHpiSensorEventTable.c +@@ -104,7 +104,6 @@ SaErrorT populate_saHpiSensorEventTable( + oid * this_child_oid, + size_t *this_child_oid_len) + { +- SaErrorT rv = SA_OK; + int new_row = MIB_FALSE; + + oid sensor_evt_oid[SENSOR_EVENT_INDEX_NR]; +@@ -167,7 +166,7 @@ SaErrorT populate_saHpiSensorEventTable( + } + if (!sensor_evt_ctx) { + snmp_log (LOG_ERR, "Not enough memory for a Sensor Event row!"); +- rv = AGENT_ERR_INTERNAL_ERROR; ++ return AGENT_ERR_INTERNAL_ERROR; + } + + /** SaHpiEntryId = ASN_UNSIGNED */ +@@ -365,7 +364,6 @@ SaErrorT async_sensor_event_add(SaHpiSes + oid * this_child_oid, + size_t *this_child_oid_len) + { +- SaErrorT rv = SA_OK; + int new_row = MIB_FALSE; + + oid sensor_evt_oid[SENSOR_EVENT_INDEX_NR]; +@@ -424,7 +422,7 @@ SaErrorT async_sensor_event_add(SaHpiSes + } + if (!sensor_evt_ctx) { + snmp_log (LOG_ERR, "Not enough memory for a Sensor Event row!"); +- rv = AGENT_ERR_INTERNAL_ERROR; ++ return AGENT_ERR_INTERNAL_ERROR; + } + + /** SaHpiEntryId = ASN_UNSIGNED */ +@@ -1196,7 +1194,6 @@ void saHpiSensorEventTable_set_reserve1( + // (saHpiSensorEventTable_context *)rg->existing_row; + // saHpiSensorEventTable_context *undo_ctx = + // (saHpiSensorEventTable_context *)rg->undo_info; +- netsnmp_variable_list *var; + netsnmp_request_group_item *current; + int rc; + +@@ -1209,7 +1206,6 @@ void saHpiSensorEventTable_set_reserve1( + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -1236,7 +1232,6 @@ void saHpiSensorEventTable_set_reserve2( + // saHpiSensorEventTable_context *row_ctx = (saHpiSensorEventTable_context *)rg->existing_row; + // saHpiSensorEventTable_context *undo_ctx = (saHpiSensorEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +- netsnmp_variable_list *var; + int rc; + + rg->rg_void = rg->list->ri; +@@ -1247,7 +1242,6 @@ void saHpiSensorEventTable_set_reserve2( + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -1279,7 +1273,6 @@ void saHpiSensorEventTable_set_reserve2( + */ + void saHpiSensorEventTable_set_action( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorEventTable_context *row_ctx = (saHpiSensorEventTable_context *)rg->existing_row; + // saHpiSensorEventTable_context *undo_ctx = (saHpiSensorEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1293,7 +1286,6 @@ void saHpiSensorEventTable_set_action( n + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1335,7 +1327,6 @@ void saHpiSensorEventTable_set_action( n + */ + void saHpiSensorEventTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorEventTable_context *row_ctx = (saHpiSensorEventTable_context *)rg->existing_row; + // saHpiSensorEventTable_context *undo_ctx = (saHpiSensorEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1345,7 +1336,6 @@ void saHpiSensorEventTable_set_commit( n + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1370,7 +1360,6 @@ void saHpiSensorEventTable_set_commit( n + */ + void saHpiSensorEventTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorEventTable_context *row_ctx = (saHpiSensorEventTable_context *)rg->existing_row; + // saHpiSensorEventTable_context *undo_ctx = (saHpiSensorEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1380,7 +1369,6 @@ void saHpiSensorEventTable_set_free( net + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1416,7 +1404,6 @@ void saHpiSensorEventTable_set_free( net + */ + void saHpiSensorEventTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorEventTable_context *row_ctx = (saHpiSensorEventTable_context *)rg->existing_row; + // saHpiSensorEventTable_context *undo_ctx = (saHpiSensorEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1426,7 +1413,6 @@ void saHpiSensorEventTable_set_undo( net + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiSensorReadingMaxTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiSensorReadingMaxTable.c ++++ openhpi-subagent-2.3.4/src/saHpiSensorReadingMaxTable.c +@@ -644,7 +644,6 @@ void saHpiSensorReadingMaxTable_set_rese + // (saHpiSensorReadingMaxTable_context *)rg->existing_row; + // saHpiSensorReadingMaxTable_context *undo_ctx = + // (saHpiSensorReadingMaxTable_context *)rg->undo_info; +- netsnmp_variable_list *var; + netsnmp_request_group_item *current; + int rc; + +@@ -658,7 +657,6 @@ void saHpiSensorReadingMaxTable_set_rese + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch (current->tri->colnum) { +@@ -685,7 +683,6 @@ void saHpiSensorReadingMaxTable_set_rese + // saHpiSensorReadingMaxTable_context *row_ctx = (saHpiSensorReadingMaxTable_context *)rg->existing_row; + // saHpiSensorReadingMaxTable_context *undo_ctx = (saHpiSensorReadingMaxTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +- netsnmp_variable_list *var; + int rc; + + DEBUGMSGTL ((AGENT, "saHpiSensorReadingMaxTable_set_reserve2, called\n")); +@@ -698,7 +695,6 @@ void saHpiSensorReadingMaxTable_set_rese + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch (current->tri->colnum) { +@@ -730,7 +726,6 @@ void saHpiSensorReadingMaxTable_set_rese + */ + void saHpiSensorReadingMaxTable_set_action( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorReadingMaxTable_context *row_ctx = (saHpiSensorReadingMaxTable_context *)rg->existing_row; + // saHpiSensorReadingMaxTable_context *undo_ctx = (saHpiSensorReadingMaxTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -746,7 +741,6 @@ void saHpiSensorReadingMaxTable_set_acti + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -782,7 +776,6 @@ void saHpiSensorReadingMaxTable_set_acti + */ + void saHpiSensorReadingMaxTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorReadingMaxTable_context *row_ctx = (saHpiSensorReadingMaxTable_context *)rg->existing_row; + // saHpiSensorReadingMaxTable_context *undo_ctx = (saHpiSensorReadingMaxTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -794,7 +787,6 @@ void saHpiSensorReadingMaxTable_set_comm + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -819,7 +811,6 @@ void saHpiSensorReadingMaxTable_set_comm + */ + void saHpiSensorReadingMaxTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorReadingMaxTable_context *row_ctx = (saHpiSensorReadingMaxTable_context *)rg->existing_row; + // saHpiSensorReadingMaxTable_context *undo_ctx = (saHpiSensorReadingMaxTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -831,7 +822,6 @@ void saHpiSensorReadingMaxTable_set_free + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -868,7 +858,6 @@ void saHpiSensorReadingMaxTable_set_free + */ + void saHpiSensorReadingMaxTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorReadingMaxTable_context *row_ctx = (saHpiSensorReadingMaxTable_context *)rg->existing_row; + // saHpiSensorReadingMaxTable_context *undo_ctx = (saHpiSensorReadingMaxTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -880,7 +869,6 @@ void saHpiSensorReadingMaxTable_set_undo + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiSensorReadingMinTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiSensorReadingMinTable.c ++++ openhpi-subagent-2.3.4/src/saHpiSensorReadingMinTable.c +@@ -643,7 +643,6 @@ void saHpiSensorReadingMinTable_set_rese + // (saHpiSensorReadingMinTable_context *)rg->existing_row; + // saHpiSensorReadingMinTable_context *undo_ctx = + // (saHpiSensorReadingMinTable_context *)rg->undo_info; +- netsnmp_variable_list *var; + netsnmp_request_group_item *current; + int rc; + +@@ -657,7 +656,6 @@ void saHpiSensorReadingMinTable_set_rese + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch (current->tri->colnum) { +@@ -684,7 +682,6 @@ void saHpiSensorReadingMinTable_set_rese + // saHpiSensorReadingMinTable_context *row_ctx = (saHpiSensorReadingMinTable_context *)rg->existing_row; + // saHpiSensorReadingMinTable_context *undo_ctx = (saHpiSensorReadingMinTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +- netsnmp_variable_list *var; + int rc; + + DEBUGMSGTL ((AGENT, "saHpiSensorReadingMinTable_set_reserve2, called\n")); +@@ -697,7 +694,6 @@ void saHpiSensorReadingMinTable_set_rese + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch (current->tri->colnum) { +@@ -729,7 +725,6 @@ void saHpiSensorReadingMinTable_set_rese + */ + void saHpiSensorReadingMinTable_set_action( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorReadingMinTable_context *row_ctx = (saHpiSensorReadingMinTable_context *)rg->existing_row; + // saHpiSensorReadingMinTable_context *undo_ctx = (saHpiSensorReadingMinTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -745,7 +740,6 @@ void saHpiSensorReadingMinTable_set_acti + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -782,7 +776,6 @@ void saHpiSensorReadingMinTable_set_acti + */ + void saHpiSensorReadingMinTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorReadingMinTable_context *row_ctx = (saHpiSensorReadingMinTable_context *)rg->existing_row; + // saHpiSensorReadingMinTable_context *undo_ctx = (saHpiSensorReadingMinTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -794,7 +787,6 @@ void saHpiSensorReadingMinTable_set_comm + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -819,7 +811,6 @@ void saHpiSensorReadingMinTable_set_comm + */ + void saHpiSensorReadingMinTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorReadingMinTable_context *row_ctx = (saHpiSensorReadingMinTable_context *)rg->existing_row; + // saHpiSensorReadingMinTable_context *undo_ctx = (saHpiSensorReadingMinTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -831,7 +822,6 @@ void saHpiSensorReadingMinTable_set_free + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -867,7 +857,6 @@ void saHpiSensorReadingMinTable_set_free + */ + void saHpiSensorReadingMinTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorReadingMinTable_context *row_ctx = (saHpiSensorReadingMinTable_context *)rg->existing_row; + // saHpiSensorReadingMinTable_context *undo_ctx = (saHpiSensorReadingMinTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -879,7 +868,6 @@ void saHpiSensorReadingMinTable_set_undo + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiSensorReadingNominalTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiSensorReadingNominalTable.c ++++ openhpi-subagent-2.3.4/src/saHpiSensorReadingNominalTable.c +@@ -630,7 +630,6 @@ void saHpiSensorReadingNominalTable_set_ + // (saHpiSensorReadingNominalTable_context *)rg->existing_row; + // saHpiSensorReadingNominalTable_context *undo_ctx = + // (saHpiSensorReadingNominalTable_context *)rg->undo_info; +- netsnmp_variable_list *var; + netsnmp_request_group_item *current; + int rc; + +@@ -643,7 +642,6 @@ void saHpiSensorReadingNominalTable_set_ + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch (current->tri->colnum) { +@@ -670,7 +668,6 @@ void saHpiSensorReadingNominalTable_set_ + // saHpiSensorReadingNominalTable_context *row_ctx = (saHpiSensorReadingNominalTable_context *)rg->existing_row; + // saHpiSensorReadingNominalTable_context *undo_ctx = (saHpiSensorReadingNominalTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +- netsnmp_variable_list *var; + int rc; + + rg->rg_void = rg->list->ri; +@@ -681,7 +678,6 @@ void saHpiSensorReadingNominalTable_set_ + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch (current->tri->colnum) { +@@ -713,7 +709,6 @@ void saHpiSensorReadingNominalTable_set_ + */ + void saHpiSensorReadingNominalTable_set_action( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorReadingNominalTable_context *row_ctx = (saHpiSensorReadingNominalTable_context *)rg->existing_row; + // saHpiSensorReadingNominalTable_context *undo_ctx = (saHpiSensorReadingNominalTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -727,7 +722,6 @@ void saHpiSensorReadingNominalTable_set_ + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -765,7 +759,6 @@ void saHpiSensorReadingNominalTable_set_ + */ + void saHpiSensorReadingNominalTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorReadingNominalTable_context *row_ctx = (saHpiSensorReadingNominalTable_context *)rg->existing_row; + // saHpiSensorReadingNominalTable_context *undo_ctx = (saHpiSensorReadingNominalTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -775,7 +768,6 @@ void saHpiSensorReadingNominalTable_set_ + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -800,7 +792,6 @@ void saHpiSensorReadingNominalTable_set_ + */ + void saHpiSensorReadingNominalTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorReadingNominalTable_context *row_ctx = (saHpiSensorReadingNominalTable_context *)rg->existing_row; + // saHpiSensorReadingNominalTable_context *undo_ctx = (saHpiSensorReadingNominalTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -810,7 +801,6 @@ void saHpiSensorReadingNominalTable_set_ + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -847,7 +837,6 @@ void saHpiSensorReadingNominalTable_set_ + */ + void saHpiSensorReadingNominalTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorReadingNominalTable_context *row_ctx = (saHpiSensorReadingNominalTable_context *)rg->existing_row; + // saHpiSensorReadingNominalTable_context *undo_ctx = (saHpiSensorReadingNominalTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -857,7 +846,6 @@ void saHpiSensorReadingNominalTable_set_ + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiSensorReadingNormalMaxTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiSensorReadingNormalMaxTable.c ++++ openhpi-subagent-2.3.4/src/saHpiSensorReadingNormalMaxTable.c +@@ -643,7 +643,6 @@ void saHpiSensorReadingNormalMaxTable_se + // (saHpiSensorReadingNormalMaxTable_context *)rg->existing_row; + // saHpiSensorReadingNormalMaxTable_context *undo_ctx = + // (saHpiSensorReadingNormalMaxTable_context *)rg->undo_info; +- netsnmp_variable_list *var; + netsnmp_request_group_item *current; + int rc; + +@@ -657,7 +656,6 @@ void saHpiSensorReadingNormalMaxTable_se + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch (current->tri->colnum) { +@@ -686,7 +684,6 @@ void saHpiSensorReadingNormalMaxTable_se + // saHpiSensorReadingNormalMaxTable_context *undo_ctx = + // (saHpiSensorReadingNormalMaxTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +- netsnmp_variable_list *var; + int rc; + + DEBUGMSGTL ((AGENT, "saHpiSensorReadingNormalMaxTable_set_reserve2, called\n")); +@@ -699,7 +696,6 @@ void saHpiSensorReadingNormalMaxTable_se + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch (current->tri->colnum) { +@@ -731,7 +727,6 @@ void saHpiSensorReadingNormalMaxTable_se + */ + void saHpiSensorReadingNormalMaxTable_set_action( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorReadingNormalMaxTable_context *row_ctx = (saHpiSensorReadingNormalMaxTable_context *)rg->existing_row; + // saHpiSensorReadingNormalMaxTable_context *undo_ctx = (saHpiSensorReadingNormalMaxTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -747,7 +742,6 @@ void saHpiSensorReadingNormalMaxTable_se + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -784,7 +778,6 @@ void saHpiSensorReadingNormalMaxTable_se + */ + void saHpiSensorReadingNormalMaxTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorReadingNormalMaxTable_context *row_ctx = (saHpiSensorReadingNormalMaxTable_context *)rg->existing_row; + // saHpiSensorReadingNormalMaxTable_context *undo_ctx = (saHpiSensorReadingNormalMaxTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -796,7 +789,6 @@ void saHpiSensorReadingNormalMaxTable_se + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -821,7 +813,6 @@ void saHpiSensorReadingNormalMaxTable_se + */ + void saHpiSensorReadingNormalMaxTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorReadingNormalMaxTable_context *row_ctx = (saHpiSensorReadingNormalMaxTable_context *)rg->existing_row; + // saHpiSensorReadingNormalMaxTable_context *undo_ctx = (saHpiSensorReadingNormalMaxTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -833,7 +824,6 @@ void saHpiSensorReadingNormalMaxTable_se + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -870,7 +860,6 @@ void saHpiSensorReadingNormalMaxTable_se + */ + void saHpiSensorReadingNormalMaxTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorReadingNormalMaxTable_context *row_ctx = (saHpiSensorReadingNormalMaxTable_context *)rg->existing_row; + // saHpiSensorReadingNormalMaxTable_context *undo_ctx = (saHpiSensorReadingNormalMaxTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -882,7 +871,6 @@ void saHpiSensorReadingNormalMaxTable_se + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiSensorReadingNormalMinTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiSensorReadingNormalMinTable.c ++++ openhpi-subagent-2.3.4/src/saHpiSensorReadingNormalMinTable.c +@@ -648,7 +648,6 @@ void saHpiSensorReadingNormalMinTable_se + // (saHpiSensorReadingNormalMinTable_context *)rg->existing_row; + // saHpiSensorReadingNormalMinTable_context *undo_ctx = + // (saHpiSensorReadingNormalMinTable_context *)rg->undo_info; +- netsnmp_variable_list *var; + netsnmp_request_group_item *current; + int rc; + +@@ -662,7 +661,6 @@ void saHpiSensorReadingNormalMinTable_se + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch (current->tri->colnum) { +@@ -689,7 +687,6 @@ void saHpiSensorReadingNormalMinTable_se + // saHpiSensorReadingNormalMinTable_context *row_ctx = (saHpiSensorReadingNormalMinTable_context *)rg->existing_row; + // saHpiSensorReadingNormalMinTable_context *undo_ctx = (saHpiSensorReadingNormalMinTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +- netsnmp_variable_list *var; + int rc; + + DEBUGMSGTL ((AGENT, "saHpiSensorReadingNormalMinTable_set_reserve2, called\n")); +@@ -702,7 +699,6 @@ void saHpiSensorReadingNormalMinTable_se + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch (current->tri->colnum) { +@@ -734,7 +730,6 @@ void saHpiSensorReadingNormalMinTable_se + */ + void saHpiSensorReadingNormalMinTable_set_action( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorReadingNormalMinTable_context *row_ctx = + // (saHpiSensorReadingNormalMinTable_context *)rg->existing_row; + // saHpiSensorReadingNormalMinTable_context *undo_ctx = +@@ -752,7 +747,6 @@ void saHpiSensorReadingNormalMinTable_se + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -789,7 +783,6 @@ void saHpiSensorReadingNormalMinTable_se + */ + void saHpiSensorReadingNormalMinTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorReadingNormalMinTable_context *row_ctx = + // (saHpiSensorReadingNormalMinTable_context *)rg->existing_row; + // saHpiSensorReadingNormalMinTable_context *undo_ctx = +@@ -803,7 +796,6 @@ void saHpiSensorReadingNormalMinTable_se + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -828,7 +820,6 @@ void saHpiSensorReadingNormalMinTable_se + */ + void saHpiSensorReadingNormalMinTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorReadingNormalMinTable_context *row_ctx = + // (saHpiSensorReadingNormalMinTable_context *)rg->existing_row; + // saHpiSensorReadingNormalMinTable_context *undo_ctx = +@@ -842,7 +833,6 @@ void saHpiSensorReadingNormalMinTable_se + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -879,7 +869,6 @@ void saHpiSensorReadingNormalMinTable_se + */ + void saHpiSensorReadingNormalMinTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorReadingNormalMinTable_context *row_ctx = + // (saHpiSensorReadingNormalMinTable_context *)rg->existing_row; + // saHpiSensorReadingNormalMinTable_context *undo_ctx = +@@ -893,7 +882,6 @@ void saHpiSensorReadingNormalMinTable_se + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiSensorTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiSensorTable.c ++++ openhpi-subagent-2.3.4/src/saHpiSensorTable.c +@@ -1043,7 +1043,6 @@ void saHpiSensorTable_set_reserve1( nets + // (saHpiSensorTable_context *)rg->existing_row; + // saHpiSensorTable_context *undo_ctx = + // (saHpiSensorTable_context *)rg->undo_info; +- netsnmp_variable_list *var; + netsnmp_request_group_item *current; + int rc; + +@@ -1057,7 +1056,6 @@ void saHpiSensorTable_set_reserve1( nets + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -1084,7 +1082,6 @@ void saHpiSensorTable_set_reserve2( nets + // saHpiSensorTable_context *row_ctx = (saHpiSensorTable_context *)rg->existing_row; + // saHpiSensorTable_context *undo_ctx = (saHpiSensorTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +- netsnmp_variable_list *var; + int rc; + + DEBUGMSGTL ((AGENT, "saHpiSensorTable_set_reserve2, called\n")); +@@ -1097,7 +1094,6 @@ void saHpiSensorTable_set_reserve2( nets + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -1129,7 +1125,6 @@ void saHpiSensorTable_set_reserve2( nets + */ + void saHpiSensorTable_set_action( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorTable_context *row_ctx = (saHpiSensorTable_context *)rg->existing_row; + // saHpiSensorTable_context *undo_ctx = (saHpiSensorTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1145,7 +1140,6 @@ void saHpiSensorTable_set_action( netsnm + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1182,7 +1176,6 @@ void saHpiSensorTable_set_action( netsnm + */ + void saHpiSensorTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorTable_context *row_ctx = (saHpiSensorTable_context *)rg->existing_row; + // saHpiSensorTable_context *undo_ctx = (saHpiSensorTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1194,7 +1187,6 @@ void saHpiSensorTable_set_commit( netsnm + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1219,7 +1211,6 @@ void saHpiSensorTable_set_commit( netsnm + */ + void saHpiSensorTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorTable_context *row_ctx = (saHpiSensorTable_context *)rg->existing_row; + // saHpiSensorTable_context *undo_ctx = (saHpiSensorTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1231,7 +1222,6 @@ void saHpiSensorTable_set_free( netsnmp_ + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1266,7 +1256,6 @@ void saHpiSensorTable_set_free( netsnmp_ + */ + void saHpiSensorTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorTable_context *row_ctx = (saHpiSensorTable_context *)rg->existing_row; + // saHpiSensorTable_context *undo_ctx = (saHpiSensorTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1278,7 +1267,6 @@ void saHpiSensorTable_set_undo( netsnmp_ + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiSensorThdLowCriticalTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiSensorThdLowCriticalTable.c ++++ openhpi-subagent-2.3.4/src/saHpiSensorThdLowCriticalTable.c +@@ -776,7 +776,6 @@ void saHpiSensorThdLowCriticalTable_set_ + // saHpiSensorThdLowCriticalTable_context *undo_ctx = + // (saHpiSensorThdLowCriticalTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +- netsnmp_variable_list *var; + int rc; + + DEBUGMSGTL ((AGENT, "saHpiSensorThdLowCriticalTable_set_reserve2, called\n")); +@@ -789,7 +788,6 @@ void saHpiSensorThdLowCriticalTable_set_ + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch (current->tri->colnum) { +@@ -897,7 +895,6 @@ void saHpiSensorThdLowCriticalTable_set_ + */ + void saHpiSensorThdLowCriticalTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorThdLowCriticalTable_context *row_ctx = + // (saHpiSensorThdLowCriticalTable_context *)rg->existing_row; + // saHpiSensorThdLowCriticalTable_context *undo_ctx = +@@ -911,7 +908,6 @@ void saHpiSensorThdLowCriticalTable_set_ + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -940,7 +936,6 @@ void saHpiSensorThdLowCriticalTable_set_ + */ + void saHpiSensorThdLowCriticalTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorThdLowCriticalTable_context *row_ctx = + // (saHpiSensorThdLowCriticalTable_context *)rg->existing_row; + // saHpiSensorThdLowCriticalTable_context *undo_ctx = +@@ -954,7 +949,6 @@ void saHpiSensorThdLowCriticalTable_set_ + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -995,7 +989,6 @@ void saHpiSensorThdLowCriticalTable_set_ + */ + void saHpiSensorThdLowCriticalTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorThdLowCriticalTable_context *row_ctx = + // (saHpiSensorThdLowCriticalTable_context *)rg->existing_row; + // saHpiSensorThdLowCriticalTable_context *undo_ctx = +@@ -1009,7 +1002,6 @@ void saHpiSensorThdLowCriticalTable_set_ + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiSensorThdLowMajorTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiSensorThdLowMajorTable.c ++++ openhpi-subagent-2.3.4/src/saHpiSensorThdLowMajorTable.c +@@ -774,7 +774,6 @@ void saHpiSensorThdLowMajorTable_set_res + // saHpiSensorThdLowMajorTable_context *row_ctx = (saHpiSensorThdLowMajorTable_context *)rg->existing_row; + // saHpiSensorThdLowMajorTable_context *undo_ctx = (saHpiSensorThdLowMajorTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +- netsnmp_variable_list *var; + int rc; + + DEBUGMSGTL ((AGENT, "saHpiSensorThdLowMajorTable_set_reserve2, called\n")); +@@ -787,7 +786,6 @@ void saHpiSensorThdLowMajorTable_set_res + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch (current->tri->colnum) { +@@ -895,7 +893,6 @@ void saHpiSensorThdLowMajorTable_set_act + */ + void saHpiSensorThdLowMajorTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorThdLowMajorTable_context *row_ctx = (saHpiSensorThdLowMajorTable_context *)rg->existing_row; + // saHpiSensorThdLowMajorTable_context *undo_ctx = (saHpiSensorThdLowMajorTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -907,7 +904,6 @@ void saHpiSensorThdLowMajorTable_set_com + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -936,7 +932,6 @@ void saHpiSensorThdLowMajorTable_set_com + */ + void saHpiSensorThdLowMajorTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorThdLowMajorTable_context *row_ctx = (saHpiSensorThdLowMajorTable_context *)rg->existing_row; + // saHpiSensorThdLowMajorTable_context *undo_ctx = (saHpiSensorThdLowMajorTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -948,7 +943,6 @@ void saHpiSensorThdLowMajorTable_set_fre + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -989,7 +983,6 @@ void saHpiSensorThdLowMajorTable_set_fre + */ + void saHpiSensorThdLowMajorTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorThdLowMajorTable_context *row_ctx = (saHpiSensorThdLowMajorTable_context *)rg->existing_row; + // saHpiSensorThdLowMajorTable_context *undo_ctx = (saHpiSensorThdLowMajorTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1001,7 +994,6 @@ void saHpiSensorThdLowMajorTable_set_und + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiSensorThdLowMinorTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiSensorThdLowMinorTable.c ++++ openhpi-subagent-2.3.4/src/saHpiSensorThdLowMinorTable.c +@@ -782,7 +782,6 @@ void saHpiSensorThdLowMinorTable_set_res + // saHpiSensorThdLowMinorTable_context *undo_ctx = + // (saHpiSensorThdLowMinorTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +- netsnmp_variable_list *var; + int rc; + + DEBUGMSGTL ((AGENT, "saHpiSensorThdLowMinorTable_set_reserve2, called\n")); +@@ -795,7 +794,6 @@ void saHpiSensorThdLowMinorTable_set_res + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -904,7 +902,6 @@ void saHpiSensorThdLowMinorTable_set_act + */ + void saHpiSensorThdLowMinorTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorThdLowMinorTable_context *row_ctx = + // (saHpiSensorThdLowMinorTable_context *)rg->existing_row; + // saHpiSensorThdLowMinorTable_context *undo_ctx = +@@ -918,7 +915,6 @@ void saHpiSensorThdLowMinorTable_set_com + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -947,7 +943,6 @@ void saHpiSensorThdLowMinorTable_set_com + */ + void saHpiSensorThdLowMinorTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorThdLowMinorTable_context *row_ctx = + // (saHpiSensorThdLowMinorTable_context *)rg->existing_row; + // saHpiSensorThdLowMinorTable_context *undo_ctx = +@@ -961,7 +956,6 @@ void saHpiSensorThdLowMinorTable_set_fre + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1002,7 +996,6 @@ void saHpiSensorThdLowMinorTable_set_fre + */ + void saHpiSensorThdLowMinorTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorThdLowMinorTable_context *row_ctx = + // (saHpiSensorThdLowMinorTable_context *)rg->existing_row; + // saHpiSensorThdLowMinorTable_context *undo_ctx = +@@ -1016,7 +1009,6 @@ void saHpiSensorThdLowMinorTable_set_und + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiSensorThdNegHysteresisTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiSensorThdNegHysteresisTable.c ++++ openhpi-subagent-2.3.4/src/saHpiSensorThdNegHysteresisTable.c +@@ -769,7 +769,6 @@ void saHpiSensorThdNegHysteresisTable_se + // saHpiSensorThdNegHysteresisTable_context *row_ctx = (saHpiSensorThdNegHysteresisTable_context *)rg->existing_row; + // saHpiSensorThdNegHysteresisTable_context *undo_ctx = (saHpiSensorThdNegHysteresisTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +- netsnmp_variable_list *var; + int rc; + + DEBUGMSGTL ((AGENT, "saHpiSensorThdNegHysteresisTable_set_reserve2 called\n")); +@@ -782,7 +781,6 @@ void saHpiSensorThdNegHysteresisTable_se + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch (current->tri->colnum) { +@@ -889,7 +887,6 @@ void saHpiSensorThdNegHysteresisTable_se + */ + void saHpiSensorThdNegHysteresisTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorThdNegHysteresisTable_context *row_ctx = (saHpiSensorThdNegHysteresisTable_context *)rg->existing_row; + // saHpiSensorThdNegHysteresisTable_context *undo_ctx = (saHpiSensorThdNegHysteresisTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -901,7 +898,6 @@ void saHpiSensorThdNegHysteresisTable_se + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -930,7 +926,6 @@ void saHpiSensorThdNegHysteresisTable_se + */ + void saHpiSensorThdNegHysteresisTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorThdNegHysteresisTable_context *row_ctx = (saHpiSensorThdNegHysteresisTable_context *)rg->existing_row; + // saHpiSensorThdNegHysteresisTable_context *undo_ctx = (saHpiSensorThdNegHysteresisTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -942,7 +937,6 @@ void saHpiSensorThdNegHysteresisTable_se + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -983,7 +977,6 @@ void saHpiSensorThdNegHysteresisTable_se + */ + void saHpiSensorThdNegHysteresisTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorThdNegHysteresisTable_context *row_ctx = (saHpiSensorThdNegHysteresisTable_context *)rg->existing_row; + // saHpiSensorThdNegHysteresisTable_context *undo_ctx = (saHpiSensorThdNegHysteresisTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -995,7 +988,6 @@ void saHpiSensorThdNegHysteresisTable_se + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiSensorThdPosHysteresisTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiSensorThdPosHysteresisTable.c ++++ openhpi-subagent-2.3.4/src/saHpiSensorThdPosHysteresisTable.c +@@ -764,7 +764,6 @@ void saHpiSensorThdPosHysteresisTable_se + // saHpiSensorThdPosHysteresisTable_context *row_ctx = (saHpiSensorThdPosHysteresisTable_context *)rg->existing_row; + // saHpiSensorThdPosHysteresisTable_context *undo_ctx = (saHpiSensorThdPosHysteresisTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +- netsnmp_variable_list *var; + int rc; + + DEBUGMSGTL ((AGENT, "saHpiSensorThdPosHysteresisTable_set_reserve2, called\n")); +@@ -777,7 +776,6 @@ void saHpiSensorThdPosHysteresisTable_se + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch (current->tri->colnum) { +@@ -883,7 +881,6 @@ void saHpiSensorThdPosHysteresisTable_se + */ + void saHpiSensorThdPosHysteresisTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorThdPosHysteresisTable_context *row_ctx = (saHpiSensorThdPosHysteresisTable_context *)rg->existing_row; + // saHpiSensorThdPosHysteresisTable_context *undo_ctx = (saHpiSensorThdPosHysteresisTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -895,7 +892,6 @@ void saHpiSensorThdPosHysteresisTable_se + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -924,7 +920,6 @@ void saHpiSensorThdPosHysteresisTable_se + */ + void saHpiSensorThdPosHysteresisTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorThdPosHysteresisTable_context *row_ctx = (saHpiSensorThdPosHysteresisTable_context *)rg->existing_row; + // saHpiSensorThdPosHysteresisTable_context *undo_ctx = (saHpiSensorThdPosHysteresisTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -936,7 +931,6 @@ void saHpiSensorThdPosHysteresisTable_se + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -977,7 +971,6 @@ void saHpiSensorThdPosHysteresisTable_se + */ + void saHpiSensorThdPosHysteresisTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorThdPosHysteresisTable_context *row_ctx = (saHpiSensorThdPosHysteresisTable_context *)rg->existing_row; + // saHpiSensorThdPosHysteresisTable_context *undo_ctx = (saHpiSensorThdPosHysteresisTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -989,7 +982,6 @@ void saHpiSensorThdPosHysteresisTable_se + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiSensorThdUpCriticalTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiSensorThdUpCriticalTable.c ++++ openhpi-subagent-2.3.4/src/saHpiSensorThdUpCriticalTable.c +@@ -766,7 +766,6 @@ void saHpiSensorThdUpCriticalTable_set_r + // saHpiSensorThdUpCriticalTable_context *row_ctx = (saHpiSensorThdUpCriticalTable_context *)rg->existing_row; + // saHpiSensorThdUpCriticalTable_context *undo_ctx = (saHpiSensorThdUpCriticalTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +- netsnmp_variable_list *var; + int rc; + + DEBUGMSGTL ((AGENT, "saHpiSensorThdUpCriticalTable_set_reserve2, called\n")); +@@ -779,7 +778,6 @@ void saHpiSensorThdUpCriticalTable_set_r + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -885,7 +883,6 @@ void saHpiSensorThdUpCriticalTable_set_a + */ + void saHpiSensorThdUpCriticalTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorThdUpCriticalTable_context *row_ctx = (saHpiSensorThdUpCriticalTable_context *)rg->existing_row; + // saHpiSensorThdUpCriticalTable_context *undo_ctx = (saHpiSensorThdUpCriticalTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -897,7 +894,6 @@ void saHpiSensorThdUpCriticalTable_set_c + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -926,7 +922,6 @@ void saHpiSensorThdUpCriticalTable_set_c + */ + void saHpiSensorThdUpCriticalTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorThdUpCriticalTable_context *row_ctx = (saHpiSensorThdUpCriticalTable_context *)rg->existing_row; + // saHpiSensorThdUpCriticalTable_context *undo_ctx = (saHpiSensorThdUpCriticalTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -938,7 +933,6 @@ void saHpiSensorThdUpCriticalTable_set_f + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -979,7 +973,6 @@ void saHpiSensorThdUpCriticalTable_set_f + */ + void saHpiSensorThdUpCriticalTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorThdUpCriticalTable_context *row_ctx = (saHpiSensorThdUpCriticalTable_context *)rg->existing_row; + // saHpiSensorThdUpCriticalTable_context *undo_ctx = (saHpiSensorThdUpCriticalTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -991,7 +984,6 @@ void saHpiSensorThdUpCriticalTable_set_u + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiSensorThdUpMajorTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiSensorThdUpMajorTable.c ++++ openhpi-subagent-2.3.4/src/saHpiSensorThdUpMajorTable.c +@@ -776,7 +776,6 @@ void saHpiSensorThdUpMajorTable_set_rese + // saHpiSensorThdUpMajorTable_context *row_ctx = (saHpiSensorThdUpMajorTable_context *)rg->existing_row; + // saHpiSensorThdUpMajorTable_context *undo_ctx = (saHpiSensorThdUpMajorTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +- netsnmp_variable_list *var; + int rc; + + DEBUGMSGTL ((AGENT, "saHpiSensorThdUpMajorTable_set_reserve2, called\n")); +@@ -789,7 +788,6 @@ void saHpiSensorThdUpMajorTable_set_rese + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch (current->tri->colnum) { +@@ -896,7 +894,6 @@ void saHpiSensorThdUpMajorTable_set_acti + */ + void saHpiSensorThdUpMajorTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorThdUpMajorTable_context *row_ctx = (saHpiSensorThdUpMajorTable_context *)rg->existing_row; + // saHpiSensorThdUpMajorTable_context *undo_ctx = (saHpiSensorThdUpMajorTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -908,7 +905,6 @@ void saHpiSensorThdUpMajorTable_set_comm + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -937,7 +933,6 @@ void saHpiSensorThdUpMajorTable_set_comm + */ + void saHpiSensorThdUpMajorTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorThdUpMajorTable_context *row_ctx = (saHpiSensorThdUpMajorTable_context *)rg->existing_row; + // saHpiSensorThdUpMajorTable_context *undo_ctx = (saHpiSensorThdUpMajorTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -949,7 +944,6 @@ void saHpiSensorThdUpMajorTable_set_free + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -990,7 +984,6 @@ void saHpiSensorThdUpMajorTable_set_free + */ + void saHpiSensorThdUpMajorTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorThdUpMajorTable_context *row_ctx = (saHpiSensorThdUpMajorTable_context *)rg->existing_row; + // saHpiSensorThdUpMajorTable_context *undo_ctx = (saHpiSensorThdUpMajorTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1002,7 +995,6 @@ void saHpiSensorThdUpMajorTable_set_undo + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiSensorThdUpMinorTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiSensorThdUpMinorTable.c ++++ openhpi-subagent-2.3.4/src/saHpiSensorThdUpMinorTable.c +@@ -765,7 +765,6 @@ void saHpiSensorThdUpMinorTable_set_rese + // saHpiSensorThdUpMinorTable_context *row_ctx = (saHpiSensorThdUpMinorTable_context *)rg->existing_row; + // saHpiSensorThdUpMinorTable_context *undo_ctx = (saHpiSensorThdUpMinorTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +- netsnmp_variable_list *var; + int rc; + + DEBUGMSGTL ((AGENT, "saHpiSensorThdUpMinorTable_set_reserve2, called\n")); +@@ -778,7 +777,6 @@ void saHpiSensorThdUpMinorTable_set_rese + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch (current->tri->colnum) { +@@ -885,7 +883,6 @@ void saHpiSensorThdUpMinorTable_set_acti + */ + void saHpiSensorThdUpMinorTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorThdUpMinorTable_context *row_ctx = (saHpiSensorThdUpMinorTable_context *)rg->existing_row; + // saHpiSensorThdUpMinorTable_context *undo_ctx = (saHpiSensorThdUpMinorTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -897,7 +894,6 @@ void saHpiSensorThdUpMinorTable_set_comm + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -926,7 +922,6 @@ void saHpiSensorThdUpMinorTable_set_comm + */ + void saHpiSensorThdUpMinorTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorThdUpMinorTable_context *row_ctx = (saHpiSensorThdUpMinorTable_context *)rg->existing_row; + // saHpiSensorThdUpMinorTable_context *undo_ctx = (saHpiSensorThdUpMinorTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -938,7 +933,6 @@ void saHpiSensorThdUpMinorTable_set_free + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +@@ -979,7 +973,6 @@ void saHpiSensorThdUpMinorTable_set_free + */ + void saHpiSensorThdUpMinorTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSensorThdUpMinorTable_context *row_ctx = (saHpiSensorThdUpMinorTable_context *)rg->existing_row; + // saHpiSensorThdUpMinorTable_context *undo_ctx = (saHpiSensorThdUpMinorTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -991,7 +984,6 @@ void saHpiSensorThdUpMinorTable_set_undo + */ + for ( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch (current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiSoftwareEventLogTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiSoftwareEventLogTable.c ++++ openhpi-subagent-2.3.4/src/saHpiSoftwareEventLogTable.c +@@ -102,7 +102,6 @@ SaErrorT populate_saHpiSoftwareEventLogT + oid * this_child_oid, + size_t *this_child_oid_len) + { +- SaErrorT rv = SA_OK; + + oid software_evt_oid[SOFTWARE_EVENT_LOG_INDEX_NR]; + netsnmp_index software_evt_idx; +@@ -175,7 +174,7 @@ SaErrorT populate_saHpiSoftwareEventLogT + + if (!software_evt_ctx) { + snmp_log (LOG_ERR, "Not enough memory for a Software Event Log row!"); +- rv = AGENT_ERR_INTERNAL_ERROR; ++ return AGENT_ERR_INTERNAL_ERROR; + } + + +@@ -235,7 +234,6 @@ SaErrorT software_event_log_clear(SaHpiS + { + oid software_evt_oid[SOFTWARE_EVENT_LOG_INDEX_NR]; + netsnmp_index software_evt_idx; +- netsnmp_index *software_index; + saHpiSoftwareEventLogTable_context *software_evt_ctx; + + DR_XREF *dr_entry; +@@ -265,7 +263,7 @@ SaErrorT software_event_log_clear(SaHpiS + /* assign the indices to the index */ + software_evt_idx.oids = (oid *) & software_evt_oid; + +- software_index = CONTAINER_FIRST(cb.container); ++ CONTAINER_FIRST(cb.container); + software_evt_ctx = CONTAINER_FIND(cb.container, &software_evt_idx); + + if (!software_evt_ctx) { +@@ -865,7 +863,6 @@ void saHpiSoftwareEventLogTable_set_rese + // (saHpiSoftwareEventLogTable_context *)rg->existing_row; + // saHpiSoftwareEventLogTable_context *undo_ctx = + // (saHpiSoftwareEventLogTable_context *)rg->undo_info; +- netsnmp_variable_list *var; + netsnmp_request_group_item *current; + int rc; + +@@ -878,7 +875,6 @@ void saHpiSoftwareEventLogTable_set_rese + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -905,7 +901,6 @@ void saHpiSoftwareEventLogTable_set_rese + // saHpiSoftwareEventLogTable_context *row_ctx = (saHpiSoftwareEventLogTable_context *)rg->existing_row; + // saHpiSoftwareEventLogTable_context *undo_ctx = (saHpiSoftwareEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +- netsnmp_variable_list *var; + int rc; + + rg->rg_void = rg->list->ri; +@@ -916,7 +911,6 @@ void saHpiSoftwareEventLogTable_set_rese + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -948,7 +942,6 @@ void saHpiSoftwareEventLogTable_set_rese + */ + void saHpiSoftwareEventLogTable_set_action( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSoftwareEventLogTable_context *row_ctx = (saHpiSoftwareEventLogTable_context *)rg->existing_row; + // saHpiSoftwareEventLogTable_context *undo_ctx = (saHpiSoftwareEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -962,7 +955,6 @@ void saHpiSoftwareEventLogTable_set_acti + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1004,7 +996,6 @@ void saHpiSoftwareEventLogTable_set_acti + */ + void saHpiSoftwareEventLogTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSoftwareEventLogTable_context *row_ctx = (saHpiSoftwareEventLogTable_context *)rg->existing_row; + // saHpiSoftwareEventLogTable_context *undo_ctx = (saHpiSoftwareEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1014,7 +1005,6 @@ void saHpiSoftwareEventLogTable_set_comm + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1039,7 +1029,6 @@ void saHpiSoftwareEventLogTable_set_comm + */ + void saHpiSoftwareEventLogTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSoftwareEventLogTable_context *row_ctx = (saHpiSoftwareEventLogTable_context *)rg->existing_row; + // saHpiSoftwareEventLogTable_context *undo_ctx = (saHpiSoftwareEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1049,7 +1038,6 @@ void saHpiSoftwareEventLogTable_set_free + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1085,7 +1073,6 @@ void saHpiSoftwareEventLogTable_set_free + */ + void saHpiSoftwareEventLogTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSoftwareEventLogTable_context *row_ctx = (saHpiSoftwareEventLogTable_context *)rg->existing_row; + // saHpiSoftwareEventLogTable_context *undo_ctx = (saHpiSoftwareEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1095,7 +1082,6 @@ void saHpiSoftwareEventLogTable_set_undo + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiSoftwareEventTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiSoftwareEventTable.c ++++ openhpi-subagent-2.3.4/src/saHpiSoftwareEventTable.c +@@ -103,7 +103,6 @@ SaErrorT populate_saHpiSoftwareEventTabl + oid * this_child_oid, + size_t *this_child_oid_len) + { +- SaErrorT rv = SA_OK; + int new_row = MIB_FALSE; + + oid software_evt_oid[SOFTWARE_EVENT_INDEX_NR]; +@@ -161,7 +160,7 @@ SaErrorT populate_saHpiSoftwareEventTabl + } + if (!software_evt_ctx) { + snmp_log (LOG_ERR, "Not enough memory for a Software Event row!"); +- rv = AGENT_ERR_INTERNAL_ERROR; ++ return AGENT_ERR_INTERNAL_ERROR; + } + + /** SaHpiEntryId = ASN_UNSIGNED */ +@@ -222,7 +221,6 @@ SaErrorT async_software_event_add(SaHpiS + oid * this_child_oid, + size_t *this_child_oid_len) + { +- SaErrorT rv = SA_OK; + int new_row = MIB_FALSE; + + oid software_evt_oid[SOFTWARE_EVENT_INDEX_NR]; +@@ -289,7 +287,7 @@ SaErrorT async_software_event_add(SaHpiS + } + if (!software_evt_ctx) { + snmp_log (LOG_ERR, "Not enough memory for a Software Event row!"); +- rv = AGENT_ERR_INTERNAL_ERROR; ++ return AGENT_ERR_INTERNAL_ERROR; + } + + /** SaHpiEntryId = ASN_UNSIGNED */ +@@ -897,7 +895,6 @@ void saHpiSoftwareEventTable_set_reserve + // (saHpiSoftwareEventTable_context *)rg->existing_row; + // saHpiSoftwareEventTable_context *undo_ctx = + // (saHpiSoftwareEventTable_context *)rg->undo_info; +- netsnmp_variable_list *var; + netsnmp_request_group_item *current; + int rc; + +@@ -910,7 +907,6 @@ void saHpiSoftwareEventTable_set_reserve + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -937,7 +933,6 @@ void saHpiSoftwareEventTable_set_reserve + // saHpiSoftwareEventTable_context *row_ctx = (saHpiSoftwareEventTable_context *)rg->existing_row; + // saHpiSoftwareEventTable_context *undo_ctx = (saHpiSoftwareEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +- netsnmp_variable_list *var; + int rc; + + rg->rg_void = rg->list->ri; +@@ -948,7 +943,6 @@ void saHpiSoftwareEventTable_set_reserve + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -980,7 +974,6 @@ void saHpiSoftwareEventTable_set_reserve + */ + void saHpiSoftwareEventTable_set_action( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSoftwareEventTable_context *row_ctx = (saHpiSoftwareEventTable_context *)rg->existing_row; + // saHpiSoftwareEventTable_context *undo_ctx = (saHpiSoftwareEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -994,7 +987,6 @@ void saHpiSoftwareEventTable_set_action( + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1039,7 +1031,6 @@ void saHpiSoftwareEventTable_set_action( + */ + void saHpiSoftwareEventTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSoftwareEventTable_context *row_ctx = (saHpiSoftwareEventTable_context *)rg->existing_row; + // saHpiSoftwareEventTable_context *undo_ctx = (saHpiSoftwareEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1049,7 +1040,6 @@ void saHpiSoftwareEventTable_set_commit( + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1074,7 +1064,6 @@ void saHpiSoftwareEventTable_set_commit( + */ + void saHpiSoftwareEventTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSoftwareEventTable_context *row_ctx = (saHpiSoftwareEventTable_context *)rg->existing_row; + // saHpiSoftwareEventTable_context *undo_ctx = (saHpiSoftwareEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1084,7 +1073,6 @@ void saHpiSoftwareEventTable_set_free( n + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1120,7 +1108,6 @@ void saHpiSoftwareEventTable_set_free( n + */ + void saHpiSoftwareEventTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiSoftwareEventTable_context *row_ctx = (saHpiSoftwareEventTable_context *)rg->existing_row; + // saHpiSoftwareEventTable_context *undo_ctx = (saHpiSoftwareEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1130,7 +1117,6 @@ void saHpiSoftwareEventTable_set_undo( n + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiUserEventLogTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiUserEventLogTable.c ++++ openhpi-subagent-2.3.4/src/saHpiUserEventLogTable.c +@@ -104,7 +104,6 @@ SaErrorT populate_saHpiUserEventLogTable + oid * this_child_oid, + size_t *this_child_oid_len) + { +- SaErrorT rv = SA_OK; + + oid user_evt_oid[USER_EVENT_LOG_INDEX_NR]; + netsnmp_index user_evt_idx; +@@ -177,7 +176,7 @@ SaErrorT populate_saHpiUserEventLogTable + + if (!user_evt_ctx) { + snmp_log (LOG_ERR, "Not enough memory for a User Event Log row!"); +- rv = AGENT_ERR_INTERNAL_ERROR; ++ return AGENT_ERR_INTERNAL_ERROR; + } + + +@@ -231,7 +230,6 @@ SaErrorT user_event_log_clear(SaHpiSessi + { + oid user_evt_oid[USER_EVENT_LOG_INDEX_NR]; + netsnmp_index user_evt_idx; +- netsnmp_index *user_index; + saHpiUserEventLogTable_context *user_evt_ctx; + + DR_XREF *dr_entry; +@@ -258,7 +256,7 @@ SaErrorT user_event_log_clear(SaHpiSessi + /* assign the indices to the index */ + user_evt_idx.oids = (oid *) & user_evt_oid; + +- user_index = CONTAINER_FIRST(cb.container); ++ CONTAINER_FIRST(cb.container); + user_evt_ctx = CONTAINER_FIND(cb.container, &user_evt_idx); + + if (!user_evt_ctx) { +@@ -1313,7 +1311,6 @@ void saHpiUserEventLogTable_set_action( + */ + void saHpiUserEventLogTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiUserEventLogTable_context *row_ctx = (saHpiUserEventLogTable_context *)rg->existing_row; + // saHpiUserEventLogTable_context *undo_ctx = (saHpiUserEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1323,7 +1320,6 @@ void saHpiUserEventLogTable_set_commit( + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1368,7 +1364,6 @@ void saHpiUserEventLogTable_set_commit( + */ + void saHpiUserEventLogTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiUserEventLogTable_context *row_ctx = (saHpiUserEventLogTable_context *)rg->existing_row; + // saHpiUserEventLogTable_context *undo_ctx = (saHpiUserEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1378,7 +1373,6 @@ void saHpiUserEventLogTable_set_free( ne + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1434,7 +1428,6 @@ void saHpiUserEventLogTable_set_free( ne + */ + void saHpiUserEventLogTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiUserEventLogTable_context *row_ctx = (saHpiUserEventLogTable_context *)rg->existing_row; + // saHpiUserEventLogTable_context *undo_ctx = (saHpiUserEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1444,7 +1437,6 @@ void saHpiUserEventLogTable_set_undo( ne + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiUserEventTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiUserEventTable.c ++++ openhpi-subagent-2.3.4/src/saHpiUserEventTable.c +@@ -114,7 +114,6 @@ SaErrorT populate_saHpiUserEventTable(Sa + oid * this_child_oid, + size_t *this_child_oid_len) + { +- SaErrorT rv = SA_OK; + int new_row = MIB_FALSE; + + oid user_evt_oid[USER_EVENT_INDEX_NR]; +@@ -170,7 +169,7 @@ SaErrorT populate_saHpiUserEventTable(Sa + } + if (!user_evt_ctx) { + snmp_log (LOG_ERR, "Not enough memory for a User Event row!"); +- rv = AGENT_ERR_INTERNAL_ERROR; ++ return AGENT_ERR_INTERNAL_ERROR; + } + + /** SaHpiEntryId = ASN_UNSIGNED */ +@@ -225,7 +224,6 @@ SaErrorT async_user_event_add(SaHpiSessi + oid * this_child_oid, + size_t *this_child_oid_len) + { +- SaErrorT rv = SA_OK; + int new_row = MIB_FALSE; + + oid user_evt_oid[USER_EVENT_INDEX_NR]; +@@ -344,7 +342,7 @@ SaErrorT async_user_event_add(SaHpiSessi + if (!user_evt_ctx) { + snmp_log (LOG_ERR, + "async_user_event_add: Not enough memory for a User Event row!"); +- rv = AGENT_ERR_INTERNAL_ERROR; ++ return AGENT_ERR_INTERNAL_ERROR; + } + + /* new row fill in everything */ +@@ -1393,7 +1391,6 @@ void saHpiUserEventTable_set_action( net + */ + void saHpiUserEventTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiUserEventTable_context *row_ctx = (saHpiUserEventTable_context *)rg->existing_row; + // saHpiUserEventTable_context *undo_ctx = (saHpiUserEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1405,7 +1402,6 @@ void saHpiUserEventTable_set_commit( net + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1450,7 +1446,6 @@ void saHpiUserEventTable_set_commit( net + */ + void saHpiUserEventTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiUserEventTable_context *row_ctx = (saHpiUserEventTable_context *)rg->existing_row; + // saHpiUserEventTable_context *undo_ctx = (saHpiUserEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1462,7 +1457,6 @@ void saHpiUserEventTable_set_free( netsn + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1518,7 +1512,6 @@ void saHpiUserEventTable_set_free( netsn + */ + void saHpiUserEventTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiUserEventTable_context *row_ctx = (saHpiUserEventTable_context *)rg->existing_row; + // saHpiUserEventTable_context *undo_ctx = (saHpiUserEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1530,7 +1523,6 @@ void saHpiUserEventTable_set_undo( netsn + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiWatchdogEventLogTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiWatchdogEventLogTable.c ++++ openhpi-subagent-2.3.4/src/saHpiWatchdogEventLogTable.c +@@ -103,7 +103,6 @@ SaErrorT populate_saHpiWatchdogEventLogT + oid * this_child_oid, + size_t *this_child_oid_len) + { +- SaErrorT rv = SA_OK; + + oid watchdog_evt_oid[WATCHDOG_EVENT_LOG_INDEX_NR]; + netsnmp_index watchdog_evt_idx; +@@ -178,7 +177,7 @@ SaErrorT populate_saHpiWatchdogEventLogT + + if (!watchdog_evt_ctx) { + snmp_log (LOG_ERR, "Not enough memory for a Watchdog Event Log row!"); +- rv = AGENT_ERR_INTERNAL_ERROR; ++ return AGENT_ERR_INTERNAL_ERROR; + } + + /** SaHpiTime = ASN_OCTET_STR */ +@@ -226,7 +225,6 @@ SaErrorT watchdog_event_log_clear(SaHpiS + + oid watchdog_evt_oid[WATCHDOG_EVENT_LOG_INDEX_NR]; + netsnmp_index watchdog_evt_idx; +- netsnmp_index *watchdog_index; + saHpiWatchdogEventLogTable_context *watchdog_evt_ctx; + + DR_XREF *dr_entry; +@@ -259,7 +257,7 @@ SaErrorT watchdog_event_log_clear(SaHpiS + /* assign the indices to the index */ + watchdog_evt_idx.oids = (oid *) & watchdog_evt_oid; + +- watchdog_index = CONTAINER_FIRST(cb.container); ++ CONTAINER_FIRST(cb.container); + watchdog_evt_ctx = CONTAINER_FIND(cb.container, &watchdog_evt_idx); + + if (!watchdog_evt_ctx) { +@@ -879,7 +877,6 @@ void saHpiWatchdogEventLogTable_set_rese + // (saHpiWatchdogEventLogTable_context *)rg->existing_row; + // saHpiWatchdogEventLogTable_context *undo_ctx = + // (saHpiWatchdogEventLogTable_context *)rg->undo_info; +- netsnmp_variable_list *var; + netsnmp_request_group_item *current; + int rc; + +@@ -892,7 +889,6 @@ void saHpiWatchdogEventLogTable_set_rese + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -919,7 +915,6 @@ void saHpiWatchdogEventLogTable_set_rese + // saHpiWatchdogEventLogTable_context *row_ctx = (saHpiWatchdogEventLogTable_context *)rg->existing_row; + // saHpiWatchdogEventLogTable_context *undo_ctx = (saHpiWatchdogEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +- netsnmp_variable_list *var; + int rc; + + rg->rg_void = rg->list->ri; +@@ -930,7 +925,6 @@ void saHpiWatchdogEventLogTable_set_rese + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -962,7 +956,6 @@ void saHpiWatchdogEventLogTable_set_rese + */ + void saHpiWatchdogEventLogTable_set_action( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiWatchdogEventLogTable_context *row_ctx = (saHpiWatchdogEventLogTable_context *)rg->existing_row; + // saHpiWatchdogEventLogTable_context *undo_ctx = (saHpiWatchdogEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -976,7 +969,6 @@ void saHpiWatchdogEventLogTable_set_acti + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1017,7 +1009,6 @@ void saHpiWatchdogEventLogTable_set_acti + */ + void saHpiWatchdogEventLogTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiWatchdogEventLogTable_context *row_ctx = (saHpiWatchdogEventLogTable_context *)rg->existing_row; + // saHpiWatchdogEventLogTable_context *undo_ctx = (saHpiWatchdogEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1027,7 +1018,6 @@ void saHpiWatchdogEventLogTable_set_comm + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1052,7 +1042,6 @@ void saHpiWatchdogEventLogTable_set_comm + */ + void saHpiWatchdogEventLogTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiWatchdogEventLogTable_context *row_ctx = (saHpiWatchdogEventLogTable_context *)rg->existing_row; + // saHpiWatchdogEventLogTable_context *undo_ctx = (saHpiWatchdogEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1062,7 +1051,6 @@ void saHpiWatchdogEventLogTable_set_free + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1098,7 +1086,6 @@ void saHpiWatchdogEventLogTable_set_free + */ + void saHpiWatchdogEventLogTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiWatchdogEventLogTable_context *row_ctx = (saHpiWatchdogEventLogTable_context *)rg->existing_row; + // saHpiWatchdogEventLogTable_context *undo_ctx = (saHpiWatchdogEventLogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1108,7 +1095,6 @@ void saHpiWatchdogEventLogTable_set_undo + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiWatchdogEventTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiWatchdogEventTable.c ++++ openhpi-subagent-2.3.4/src/saHpiWatchdogEventTable.c +@@ -104,7 +104,6 @@ SaErrorT populate_saHpiWatchdogEventTabl + oid * this_child_oid, + size_t *this_child_oid_len) + { +- SaErrorT rv = SA_OK; + int new_row = MIB_FALSE; + + oid watchdog_evt_oid[WATCHDOG_EVENT_INDEX_NR]; +@@ -165,7 +164,7 @@ SaErrorT populate_saHpiWatchdogEventTabl + } + if (!watchdog_evt_ctx) { + snmp_log (LOG_ERR, "Not enough memory for a Watchdog Event row!"); +- rv = AGENT_ERR_INTERNAL_ERROR; ++ return AGENT_ERR_INTERNAL_ERROR; + } + + /** SaHpiEntryId = ASN_UNSIGNED */ +@@ -215,7 +214,6 @@ SaErrorT async_watchdog_event_add(SaHpiS + oid * this_child_oid, + size_t *this_child_oid_len) + { +- SaErrorT rv = SA_OK; + int new_row = MIB_FALSE; + + oid watchdog_evt_oid[WATCHDOG_EVENT_INDEX_NR]; +@@ -284,7 +282,7 @@ SaErrorT async_watchdog_event_add(SaHpiS + } + if (!watchdog_evt_ctx) { + snmp_log (LOG_ERR, "Not enough memory for a Watchdog Event row!"); +- rv = AGENT_ERR_INTERNAL_ERROR; ++ return AGENT_ERR_INTERNAL_ERROR; + } + + /** SaHpiEntryId = ASN_UNSIGNED */ +@@ -907,7 +905,6 @@ void saHpiWatchdogEventTable_set_reserve + // (saHpiWatchdogEventTable_context *)rg->existing_row; + // saHpiWatchdogEventTable_context *undo_ctx = + // (saHpiWatchdogEventTable_context *)rg->undo_info; +- netsnmp_variable_list *var; + netsnmp_request_group_item *current; + int rc; + +@@ -920,7 +917,6 @@ void saHpiWatchdogEventTable_set_reserve + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -947,7 +943,6 @@ void saHpiWatchdogEventTable_set_reserve + // saHpiWatchdogEventTable_context *row_ctx = (saHpiWatchdogEventTable_context *)rg->existing_row; + // saHpiWatchdogEventTable_context *undo_ctx = (saHpiWatchdogEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +- netsnmp_variable_list *var; + int rc; + + rg->rg_void = rg->list->ri; +@@ -958,7 +953,6 @@ void saHpiWatchdogEventTable_set_reserve + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -990,7 +984,6 @@ void saHpiWatchdogEventTable_set_reserve + */ + void saHpiWatchdogEventTable_set_action( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiWatchdogEventTable_context *row_ctx = (saHpiWatchdogEventTable_context *)rg->existing_row; + // saHpiWatchdogEventTable_context *undo_ctx = (saHpiWatchdogEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1004,7 +997,6 @@ void saHpiWatchdogEventTable_set_action( + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1046,7 +1038,6 @@ void saHpiWatchdogEventTable_set_action( + */ + void saHpiWatchdogEventTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiWatchdogEventTable_context *row_ctx = (saHpiWatchdogEventTable_context *)rg->existing_row; + // saHpiWatchdogEventTable_context *undo_ctx = (saHpiWatchdogEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1056,7 +1047,6 @@ void saHpiWatchdogEventTable_set_commit( + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1081,7 +1071,6 @@ void saHpiWatchdogEventTable_set_commit( + */ + void saHpiWatchdogEventTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiWatchdogEventTable_context *row_ctx = (saHpiWatchdogEventTable_context *)rg->existing_row; + // saHpiWatchdogEventTable_context *undo_ctx = (saHpiWatchdogEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1091,7 +1080,6 @@ void saHpiWatchdogEventTable_set_free( n + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1127,7 +1115,6 @@ void saHpiWatchdogEventTable_set_free( n + */ + void saHpiWatchdogEventTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiWatchdogEventTable_context *row_ctx = (saHpiWatchdogEventTable_context *)rg->existing_row; + // saHpiWatchdogEventTable_context *undo_ctx = (saHpiWatchdogEventTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1137,7 +1124,6 @@ void saHpiWatchdogEventTable_set_undo( n + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +Index: openhpi-subagent-2.3.4/src/saHpiWatchdogTable.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/saHpiWatchdogTable.c ++++ openhpi-subagent-2.3.4/src/saHpiWatchdogTable.c +@@ -1200,7 +1200,6 @@ void saHpiWatchdogTable_set_reserve2( ne + // saHpiWatchdogTable_context *row_ctx = (saHpiWatchdogTable_context *)rg->existing_row; + // saHpiWatchdogTable_context *undo_ctx = (saHpiWatchdogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +- netsnmp_variable_list *var; + int rc; + + rg->rg_void = rg->list->ri; +@@ -1211,7 +1210,6 @@ void saHpiWatchdogTable_set_reserve2( ne + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + rc = SNMP_ERR_NOERROR; + + switch(current->tri->colnum) { +@@ -1469,7 +1467,6 @@ void saHpiWatchdogTable_set_action( nets + */ + void saHpiWatchdogTable_set_commit( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiWatchdogTable_context *row_ctx = (saHpiWatchdogTable_context *)rg->existing_row; + // saHpiWatchdogTable_context *undo_ctx = (saHpiWatchdogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1479,7 +1476,6 @@ void saHpiWatchdogTable_set_commit( nets + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1544,7 +1540,6 @@ void saHpiWatchdogTable_set_commit( nets + */ + void saHpiWatchdogTable_set_free( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiWatchdogTable_context *row_ctx = (saHpiWatchdogTable_context *)rg->existing_row; + // saHpiWatchdogTable_context *undo_ctx = (saHpiWatchdogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1554,7 +1549,6 @@ void saHpiWatchdogTable_set_free( netsnm + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + +@@ -1631,7 +1625,6 @@ void saHpiWatchdogTable_set_free( netsnm + */ + void saHpiWatchdogTable_set_undo( netsnmp_request_group *rg ) + { +- netsnmp_variable_list *var; + // saHpiWatchdogTable_context *row_ctx = (saHpiWatchdogTable_context *)rg->existing_row; + // saHpiWatchdogTable_context *undo_ctx = (saHpiWatchdogTable_context *)rg->undo_info; + netsnmp_request_group_item *current; +@@ -1641,7 +1634,6 @@ void saHpiWatchdogTable_set_undo( netsnm + */ + for( current = rg->list; current; current = current->next ) { + +- var = current->ri->requestvb; + + switch(current->tri->colnum) { + 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 @@ +diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiAnnouncementTable.c openhpi-subagent-2.3.4/src/saHpiAnnouncementTable.c +--- openhpi-subagent-2.3.4.orig/src/saHpiAnnouncementTable.c 2006-09-13 17:41:26.000000000 +0200 ++++ openhpi-subagent-2.3.4/src/saHpiAnnouncementTable.c 2009-10-26 11:04:01.000000000 +0100 +@@ -429,7 +429,7 @@ int announcement_add (saHpiAnnouncementT + if (rc != SA_OK) { + DEBUGMSGTL ((AGENT, + "announcement_add: oh_encode_entitypath Failed:" +- " rc = %d\n", ++ " rc = %s\n", + oh_lookup_error(rc))); + } + +@@ -450,7 +450,7 @@ int announcement_add (saHpiAnnouncementT + if (rc != SA_OK) { + DEBUGMSGTL ((AGENT, + "announcement_add: oh_encode_eventstate Failed:" +- " rc = %d\n", ++ " rc = %s\n", + oh_lookup_error(rc))); + } + } +diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiAreaTable.c openhpi-subagent-2.3.4/src/saHpiAreaTable.c +--- openhpi-subagent-2.3.4.orig/src/saHpiAreaTable.c 2006-09-13 17:41:26.000000000 +0200 ++++ openhpi-subagent-2.3.4/src/saHpiAreaTable.c 2009-10-26 11:04:01.000000000 +0100 +@@ -1111,7 +1111,7 @@ void saHpiAreaTable_set_reserve1( netsnm + dri_entry->entry_id++; + } else { + DEBUGMSGTL ((AGENT,"dri_entry->entry_id [%d]\n", dri_entry->entry_id)); +- DEBUGMSGTL ((AGENT,"row_ctx->index.oids[saHpiAreaId_INDEX] [%d]\n", row_ctx->index.oids[saHpiAreaId_INDEX])); ++ DEBUGMSGTL ((AGENT,"row_ctx->index.oids[saHpiAreaId_INDEX] [%ld]\n", row_ctx->index.oids[saHpiAreaId_INDEX])); + DEBUGMSGTL ((AGENT, + "ERROR: saHpiAreaTable_set_reserve1() User specified AreaId invalid!!!\n")); + rc = SNMP_ERR_WRONGVALUE; +diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiAutoInsertTimeoutTable.c openhpi-subagent-2.3.4/src/saHpiAutoInsertTimeoutTable.c +--- openhpi-subagent-2.3.4.orig/src/saHpiAutoInsertTimeoutTable.c 2006-09-13 17:41:26.000000000 +0200 ++++ openhpi-subagent-2.3.4/src/saHpiAutoInsertTimeoutTable.c 2009-10-26 11:04:01.000000000 +0100 +@@ -587,7 +587,7 @@ void saHpiAutoInsertTimeoutTable_set_res + rc = SNMP_ERR_WRONGLENGTH; + DEBUGMSGTL ((AGENT, + "COLUMN_SAHPIAUTOINSERTTIMEOUTFORINSERT" +- " SNMP_ERR_WRONGLENGTH\n", rc)); ++ " SNMP_ERR_WRONGLENGTH\n")); + } + } + break; +diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiDomainInfoTable.c openhpi-subagent-2.3.4/src/saHpiDomainInfoTable.c +--- openhpi-subagent-2.3.4.orig/src/saHpiDomainInfoTable.c 2006-09-13 17:41:26.000000000 +0200 ++++ openhpi-subagent-2.3.4/src/saHpiDomainInfoTable.c 2009-10-26 11:04:01.000000000 +0100 +@@ -350,7 +350,7 @@ int handle_saHpiDomainInfoActiveEntries( + netsnmp_agent_request_info *reqinfo, + netsnmp_request_info *requests) + { +- DEBUGMSGTL ((AGENT, "handle_saHpiDomainInfoActiveEntries: Entry Count is %d\n", ++ DEBUGMSGTL ((AGENT, "handle_saHpiDomainInfoActiveEntries: Entry Count is %ld\n", + domain_info_entry_count)); + + /* We are never called for a GETNEXT if it's registered as a +diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiDomainReferenceTable.c openhpi-subagent-2.3.4/src/saHpiDomainReferenceTable.c +--- openhpi-subagent-2.3.4.orig/src/saHpiDomainReferenceTable.c 2006-09-13 17:41:26.000000000 +0200 ++++ openhpi-subagent-2.3.4/src/saHpiDomainReferenceTable.c 2009-10-26 11:04:01.000000000 +0100 +@@ -220,7 +220,7 @@ handle_saHpiDomainReferenceActiveEntries + netsnmp_request_info *requests) + { + DEBUGMSGTL ((AGENT, +- "handle_saHpiDomainReferenceActiveEntries: Entry Count is %d\n", ++ "handle_saHpiDomainReferenceActiveEntries: Entry Count is %ld\n", + domain_reference_entry_count)); + + domain_reference_entry_count = CONTAINER_SIZE (cb.container); +diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiEventLogInfoTable.c openhpi-subagent-2.3.4/src/saHpiEventLogInfoTable.c +--- openhpi-subagent-2.3.4.orig/src/saHpiEventLogInfoTable.c 2006-09-13 17:41:26.000000000 +0200 ++++ openhpi-subagent-2.3.4/src/saHpiEventLogInfoTable.c 2009-10-26 11:04:01.000000000 +0100 +@@ -1184,7 +1184,7 @@ void saHpiEventLogInfoTable_set_reserve1 + rc = SNMP_ERR_WRONGLENGTH; + DEBUGMSGTL ((AGENT, + "COLUMN_SAHPIEVENTLOGINFOTIME" +- " SNMP_ERR_WRONGLENGTH\n", rc)); ++ " SNMP_ERR_WRONGLENGTH\n")); + } + } + +diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiFieldTable.c openhpi-subagent-2.3.4/src/saHpiFieldTable.c +--- openhpi-subagent-2.3.4.orig/src/saHpiFieldTable.c 2006-09-13 17:41:26.000000000 +0200 ++++ openhpi-subagent-2.3.4/src/saHpiFieldTable.c 2009-10-26 11:04:01.000000000 +0100 +@@ -1409,7 +1409,7 @@ void saHpiFieldTable_set_reserve1( netsn + } else { + DEBUGMSGTL ((AGENT,"***********************************************\n")); + DEBUGMSGTL ((AGENT,"dria_entry->entry_id [%d]\n", dria_entry->entry_id)); +- DEBUGMSGTL ((AGENT,"row_ctx->index.oids[saHpiFieldId_INDEX] [%d]\n", ++ DEBUGMSGTL ((AGENT,"row_ctx->index.oids[saHpiFieldId_INDEX] [%ld]\n", + row_ctx->index.oids[saHpiFieldId_field_INDEX])); + DEBUGMSGTL ((AGENT, + "ERROR: saHpiFieldTable_set_reserve1() User specified FieldId invalid!!!\n")); +diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiHotSwapTable.c openhpi-subagent-2.3.4/src/saHpiHotSwapTable.c +--- openhpi-subagent-2.3.4.orig/src/saHpiHotSwapTable.c 2006-09-13 17:41:26.000000000 +0200 ++++ openhpi-subagent-2.3.4/src/saHpiHotSwapTable.c 2009-10-26 11:04:01.000000000 +0100 +@@ -997,7 +997,7 @@ void saHpiHotSwapTable_set_reserve1( net + rc = SNMP_ERR_WRONGLENGTH; + DEBUGMSGTL ((AGENT, + "COLUMN_SAHPIHOTSWAPEXTRACTTIMEOUT" +- " SNMP_ERR_WRONGLENGTH\n", rc)); ++ " SNMP_ERR_WRONGLENGTH\n")); + } + } + break; +diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiRdrTable.c openhpi-subagent-2.3.4/src/saHpiRdrTable.c +--- openhpi-subagent-2.3.4.orig/src/saHpiRdrTable.c 2006-09-13 17:41:26.000000000 +0200 ++++ openhpi-subagent-2.3.4/src/saHpiRdrTable.c 2009-10-26 11:04:01.000000000 +0100 +@@ -492,7 +492,7 @@ int populate_saHpiRdrTable(SaHpiSessionI + + rdr_entry_count = CONTAINER_SIZE (cb.container); + +- DEBUGMSGTL ((AGENT, "populate_saHpiRdrTable: rdr_entry_count = %d\n", rdr_entry_count)); ++ DEBUGMSGTL ((AGENT, "populate_saHpiRdrTable: rdr_entry_count = %ld\n", rdr_entry_count)); + + + subagent_unlock(&hpi_lock_data); +@@ -528,8 +528,8 @@ SaErrorT clear_rdr_container(SaHpiDomain + do { + rdr_ctx = CONTAINER_FIND(cb.container, row_idx); + +- DEBUGMSGTL ((AGENT, "CONTAINER_FIND: rdr_ctx: [%d] row_idx: [%d]" +- " counter [%d], rdr_entry_count [%d]\n", ++ DEBUGMSGTL ((AGENT, "CONTAINER_FIND: rdr_ctx: [%p] row_idx: [%p]" ++ " counter [%d], rdr_entry_count [%ld]\n", + rdr_ctx, row_idx, counter++, rdr_entry_count)); + + row_idx = CONTAINER_NEXT(cb.container, row_idx); +diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiResourceTable.c openhpi-subagent-2.3.4/src/saHpiResourceTable.c +--- openhpi-subagent-2.3.4.orig/src/saHpiResourceTable.c 2006-09-13 17:41:26.000000000 +0200 ++++ openhpi-subagent-2.3.4/src/saHpiResourceTable.c 2009-10-26 11:04:07.000000000 +0100 +@@ -254,8 +254,8 @@ int populate_saHpiResourceTable(SaHpiSes + + DEBUGMSGTL ((AGENT, "populate_saHpiResourceTable RptEntry.ResourceTag.DataLength rv = %d\n", + RptEntry.ResourceTag.DataLength)); +- DEBUGMSGTL ((AGENT, "populate_saHpiResourceTable strlen(RptEntry.ResourceTag.Data) rv = %d\n", +- strlen((const char *)RptEntry.ResourceTag.Data))); ++ DEBUGMSGTL ((AGENT, "populate_saHpiResourceTable strlen(RptEntry.ResourceTag.Data) rv = %ld\n", ++ (long)strlen((const char *)RptEntry.ResourceTag.Data))); + + + /** INTEGER = ASN_INTEGER */ +@@ -322,7 +322,7 @@ int populate_saHpiResourceTable(SaHpiSes + + resource_entry_count = CONTAINER_SIZE (cb.container); + +- DEBUGMSGTL ((AGENT, "resource_entry_count = %d\n", resource_entry_count)); ++ DEBUGMSGTL ((AGENT, "resource_entry_count = %ld\n", resource_entry_count)); + + subagent_unlock(&hpi_lock_data); + +@@ -630,7 +630,7 @@ DEBUGMSGTL ((AGENT, "**** MIB_FALSE [%d] + resource_entry_count = CONTAINER_SIZE (cb.container); + + +- DEBUGMSGTL ((AGENT, "async_event_resource: resource_entry_count = %d\n", ++ DEBUGMSGTL ((AGENT, "async_event_resource: resource_entry_count = %ld\n", + resource_entry_count)); + + return rv; +@@ -828,7 +828,7 @@ int handle_saHpiResourceActiveEntries(ne + { + + DEBUGMSGTL ((AGENT, +- "handle_saHpiResourceActiveEntries: Entry Count is %d\n", ++ "handle_saHpiResourceActiveEntries: Entry Count is %ld\n", + resource_entry_count)); + + /* We are never called for a GETNEXT if it's registered as a +diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiUserEventLogTable.c openhpi-subagent-2.3.4/src/saHpiUserEventLogTable.c +--- openhpi-subagent-2.3.4.orig/src/saHpiUserEventLogTable.c 2006-09-13 17:41:26.000000000 +0200 ++++ openhpi-subagent-2.3.4/src/saHpiUserEventLogTable.c 2009-10-26 11:04:01.000000000 +0100 +@@ -1076,7 +1076,7 @@ void saHpiUserEventLogTable_set_reserve1 + } else { + DEBUGMSGTL ((AGENT,"***********************************************\n")); + DEBUGMSGTL ((AGENT,"dr_entry->entry_id [%d]\n", dr_entry->entry_id)); +- DEBUGMSGTL ((AGENT,"row_ctx->index.oids[saHpiUserEventEntryId_event_log_INDEX] [%d]\n", ++ DEBUGMSGTL ((AGENT,"row_ctx->index.oids[saHpiUserEventEntryId_event_log_INDEX] [%ld]\n", + row_ctx->index.oids[saHpiUserEventEntryId_event_log_INDEX])); + DEBUGMSGTL ((AGENT, + "ERROR: saHpiUserEventLogTable_set_reserve1() " +diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiUserEventTable.c openhpi-subagent-2.3.4/src/saHpiUserEventTable.c +--- openhpi-subagent-2.3.4.orig/src/saHpiUserEventTable.c 2006-09-13 17:41:26.000000000 +0200 ++++ openhpi-subagent-2.3.4/src/saHpiUserEventTable.c 2009-10-26 11:04:01.000000000 +0100 +@@ -1158,7 +1158,7 @@ void saHpiUserEventTable_set_reserve1( n + } else { + DEBUGMSGTL ((AGENT,"***********************************************\n")); + DEBUGMSGTL ((AGENT,"dr_entry->entry_id [%d]\n", dr_entry->entry_id)); +- DEBUGMSGTL ((AGENT,"row_ctx->index.oids[saHpiUserEventEntryId_event_INDEX] [%d]\n", ++ DEBUGMSGTL ((AGENT,"row_ctx->index.oids[saHpiUserEventEntryId_event_INDEX] [%ld]\n", + row_ctx->index.oids[saHpiUserEventEntryId_event_INDEX])); + DEBUGMSGTL ((AGENT, + "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 @@ +Index: openhpi-subagent-2.3.4/src/hpiSubagent.c +=================================================================== +--- openhpi-subagent-2.3.4.orig/src/hpiSubagent.c ++++ openhpi-subagent-2.3.4/src/hpiSubagent.c +@@ -219,7 +219,6 @@ main (int argc, char **argv) + SaHpiVersionT hpiVer; + SaHpiSessionIdT sessionid; + SaHpiDomainInfoT domain_info; +- SaHpiBoolT run_threaded = TRUE; + + pid_t child; + +@@ -479,7 +478,6 @@ main (int argc, char **argv) + env = getenv("OPENHPI_THREADED"); + if ((env == (char *)NULL) || (strcmp(env, "NO") == 0)) { + DEBUGMSGTL ((AGENT, "Running in nonthreaded mode. Configuring polling mechanism\n")); +- run_threaded = SAHPI_FALSE; + set_run_threaded(FALSE); + if (init_alarm() != AGENT_ERR_NOERROR) { + 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 @@ +DESCRIPTION = "The openhpi-subagent package contains the Service Availability Forum's Hardware Platform Interface SNMP sub-agent." +SECTION = "console/network" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=fc94392823a2f9536e4ca1dc82381bc1" +DEPENDS = "openssl zlib openhpi net-snmp" + +INC_PR = "r0" + +inherit pkgconfig autotools gettext + +EXTRA_OECONF = "--with-net-snmp-config=${STAGING_BINDIR}/net-snmp-config" + +FILES_${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 @@ +PR = "${INC_PR}.0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/openhpi/openhpi-subagent-${PV}.tar.gz \ + file://fix_autoconf.patch \ + file://openhpi-subagent-2.3.4-format.patch \ + file://remove_unused_but_set_variable.patch \ + file://glib.patch \ + file://glib_mutex.patch \ + file://netsnmp_unused.patch \ + file://configure_pkgconfig_openhpiutils.patch \ + " +SRC_URI[md5sum] = "17e84d43ef1d24ae8caa52615efb9512" +SRC_URI[sha256sum] = "76ed0a84fdf6952341e90fc1588c2bc38021d742a65eefab92e82fd40099639a" + +require 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 @@ +--- a/configure.ac 2012-08-27 15:08:58.000000000 -0300 ++++ b/configure.ac 2013-07-31 08:55:00.017653886 -0300 +@@ -277,6 +277,7 @@ + if test "x$have_sysfs" = "xyes"; then + AC_SUBST(SYSFS,sysfs) + AC_SUBST(WITH_SYSFS,1) ++ AC_CHECK_HEADERS([sysfs/libsysfs.h]) + else + OH_CHECK_FAIL(libsysfs,,http://linux-diag.sf.net, + Can not build sysfs support without libsysfs) +@@ -287,6 +288,7 @@ + [if test "x$have_sysfs" = "xyes"; then + AC_SUBST(SYSFS,sysfs) + AC_SUBST(WITH_SYSFS,1) ++ AC_SUBST(SYSFS_INCLUDE) + else + AC_SUBST(WITH_SYSFS,0) + 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 @@ +Index: openhpi-3.2.1/plugins/sysfs/Makefile.am +=================================================================== +--- openhpi-3.2.1.orig/plugins/sysfs/Makefile.am ++++ openhpi-3.2.1/plugins/sysfs/Makefile.am +@@ -33,7 +33,7 @@ MAINTAINERCLEANFILES = Makefile.in + + AM_CPPFLAGS = -DG_LOG_DOMAIN=\"sysfs\" + +-INCLUDES = @OPENHPI_INCLUDES@ -I/usr/include/sysfs ++INCLUDES = @OPENHPI_INCLUDES@ + + pkglib_LTLIBRARIES = libsysfs2hpi.la + +Index: openhpi-3.2.1/plugins/sysfs/sysfs2hpi.c +=================================================================== +--- openhpi-3.2.1.orig/plugins/sysfs/sysfs2hpi.c ++++ openhpi-3.2.1/plugins/sysfs/sysfs2hpi.c +@@ -18,7 +18,7 @@ + + #include + #include +-#include ++#include + + #include + #include 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 @@ +Index: openhpi-3.2.1/plugins/ilo2_ribcl/ilo2_ribcl_xml.c +=================================================================== +--- openhpi-3.2.1.orig/plugins/ilo2_ribcl/ilo2_ribcl_xml.c ++++ openhpi-3.2.1/plugins/ilo2_ribcl/ilo2_ribcl_xml.c +@@ -44,8 +44,8 @@ + #include + #include + #include +-#include +-#include ++#include ++#include + #include + #include + #include 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 @@ +diff -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 +--- openhpi-3.0.0/plugins/dynamic_simulator/new_sim_file_util.cpp 2011-10-17 13:57:23.000000000 -0200 ++++ openhpi-3.0.0.oc/plugins/dynamic_simulator/new_sim_file_util.cpp 2012-01-10 14:16:29.000000000 -0200 +@@ -118,7 +118,7 @@ + } else if (cur_token == G_TOKEN_STRING) { + datafield = g_strdup(m_scanner->value.v_string); + } else { +- err("Processing parse textbuffer: unknow value type %u", cur_token); ++ err("Processing parse textbuffer: unknown value type %u", cur_token); + success = false; + break; + } +@@ -129,7 +129,7 @@ + tmp.Language = ( SaHpiLanguageT ) val; + } else if (!strcmp( "DataLength", field )) { + tmp.DataLength = val; +- } else if (!strcmp( "Data", field )) { ++ } else if ((!strcmp( "Data", field ))&&datafield) { + strncpy ((char *) tmp.Data, datafield, SAHPI_MAX_TEXT_BUFFER_LENGTH); + } else { + err("Processing parse textbuffer: unknown field %s", field); +diff -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 +--- openhpi-3.0.0/plugins/dynamic_simulator/new_sim_sensor_threshold.cpp 2011-10-17 13:57:23.000000000 -0200 ++++ openhpi-3.0.0.oc/plugins/dynamic_simulator/new_sim_sensor_threshold.cpp 2012-01-10 14:16:25.000000000 -0200 +@@ -478,7 +478,10 @@ + rv = checkOrdering( tmp ); + if ( rv != SA_OK ) + return rv; +- ++ ++ // Now check if the threshold changes caused an event ++ CheckThresholdsAndPublishEvents(&tmp); ++ + // Ok, it seems everything is fine - take the new values + memcpy( &m_thres, &tmp, sizeof(SaHpiSensorThresholdsT)); + +@@ -486,6 +489,183 @@ + } + + ++void NewSimulatorSensorThreshold::CreateThresholdEvent(SaHpiEventStateT theActualEvent, SaHpiBoolT asserted) ++{ ++ NewSimulatorResource *res = Resource(); ++ if( !res ) ++ { ++ stdlog << "CreateEnableChangeEvent: No resource !\n"; ++ return; ++ } ++ ++ oh_event *e = (oh_event *)g_malloc0( sizeof( struct oh_event ) ); ++ ++ e->event.EventType = SAHPI_ET_SENSOR_ENABLE_CHANGE; ++ ++ SaHpiRptEntryT *rptentry = oh_get_resource_by_id( res->Domain()->GetHandler()->rptcache, res->ResourceId() ); ++ SaHpiRdrT *rdrentry = oh_get_rdr_by_id( res->Domain()->GetHandler()->rptcache, res->ResourceId(), m_record_id ); ++ ++ if ( rptentry ) ++ e->resource = *rptentry; ++ else ++ e->resource.ResourceCapabilities = 0; ++ ++ if ( rdrentry ) ++ e->rdrs = g_slist_append(e->rdrs, g_memdup(rdrentry, sizeof(SaHpiRdrT))); ++ else ++ e->rdrs = NULL; ++ ++ // Fill the event data ++ e->event.Source = res->ResourceId(); ++ e->event.EventType = SAHPI_ET_SENSOR; ++ ++ if ((theActualEvent & SAHPI_ES_LOWER_MINOR) || (theActualEvent & SAHPI_ES_UPPER_MINOR)) ++ e->event.Severity = SAHPI_MINOR; ++ if ((theActualEvent & SAHPI_ES_LOWER_MAJOR) || (theActualEvent & SAHPI_ES_UPPER_MAJOR)) ++ e->event.Severity = SAHPI_MAJOR; ++ if ((theActualEvent & SAHPI_ES_LOWER_CRIT) || (theActualEvent & SAHPI_ES_UPPER_CRIT)) ++ e->event.Severity = SAHPI_CRITICAL; ++ ++ oh_gettimeofday(&e->event.Timestamp); ++ ++ // sensor enable event ++ SaHpiSensorEventT *se = &e->event.EventDataUnion.SensorEvent; ++ se->SensorNum = m_sensor_record.Num; ++ se->SensorType = Type(); ++ se->EventCategory = SAHPI_EC_THRESHOLD; ++ se->Assertion = asserted; // True if the condition is being raised, False if cleared ++ ++ se->EventState = theActualEvent; ++ se->OptionalDataPresent = 0; ++ ++ // Issue the event ++ stdlog << "NewSimulatorSensorThreshold::CreateThresholdEvent OH_ET_HPI Event threshold resource " << res-> ResourceId() << "\n"; ++ res->Domain()->AddHpiEvent( e ); ++ ++} ++ ++ ++SaErrorT NewSimulatorSensorThreshold::CheckThresholdsAndPublishEvents(const SaHpiSensorThresholdsT* thres) ++{ ++ // Only generate if the threshold is supported. ++ if (thres->UpMinor.IsSupported) { ++ // Crossing the threshold in both directions (from deasserted to asserted, ++ // and from asserted to deasserted) needs to be handled. ++ ++ if (m_event_data & SAHPI_ES_UPPER_MINOR) { ++ // See if the threshold is no longer exceeded ++ if (lt(m_read_data,thres->UpMinor)) { ++ CreateThresholdEvent(SAHPI_ES_UPPER_MINOR,SAHPI_FALSE); ++ m_event_data &= ~SAHPI_ES_UPPER_MINOR; ++ } ++ ++ } ++ else { ++ // See if the threshold is exceeded ++ if (gt(m_read_data,thres->UpMinor)) { ++ CreateThresholdEvent(SAHPI_ES_UPPER_MINOR,SAHPI_TRUE); ++ m_event_data |= SAHPI_ES_UPPER_MINOR; ++ } ++ } ++ } ++ ++ if (thres->UpMajor.IsSupported) { ++ if (m_event_data & SAHPI_ES_UPPER_MAJOR) { ++ // See if the threshold is no longer exceeded ++ if (lt(m_read_data,thres->UpMajor)) { ++ CreateThresholdEvent(SAHPI_ES_UPPER_MAJOR,SAHPI_FALSE); ++ m_event_data &= ~SAHPI_ES_UPPER_MAJOR; ++ } ++ ++ } ++ else { ++ // See if the threshold is exceeded ++ if (gt(m_read_data,thres->UpMajor)) { ++ CreateThresholdEvent(SAHPI_ES_UPPER_MAJOR,SAHPI_TRUE); ++ m_event_data |= SAHPI_ES_UPPER_MAJOR; ++ } ++ } ++ } ++ ++ if (thres->UpCritical.IsSupported) { ++ if (m_event_data & SAHPI_ES_UPPER_CRIT) { ++ // See if the threshold is no longer exceeded ++ if (lt(m_read_data,thres->UpCritical)) { ++ CreateThresholdEvent(SAHPI_ES_UPPER_CRIT,SAHPI_FALSE); ++ m_event_data &= ~SAHPI_ES_UPPER_CRIT; ++ } ++ } ++ else { ++ // See if the threshold is exceeded ++ if (gt(m_read_data,thres->UpCritical)) { ++ CreateThresholdEvent(SAHPI_ES_UPPER_CRIT,SAHPI_TRUE); ++ m_event_data |= SAHPI_ES_UPPER_CRIT; ++ } ++ } ++ } ++ ++ ++ ++ if (thres->LowMinor.IsSupported) { ++ // Crossing the threshold in both directions (from deasserted to asserted, ++ // and from asserted to deasserted) needs to be handled. ++ ++ if (m_event_data & SAHPI_ES_LOWER_MINOR) { ++ // See if the threshold is no longer exceeded ++ if (lt(m_read_data,thres->LowMinor)) { ++ CreateThresholdEvent(SAHPI_ES_LOWER_MINOR,SAHPI_FALSE); ++ m_event_data &= ~SAHPI_ES_LOWER_MINOR; ++ } ++ ++ } ++ else { ++ // See if the threshold is exceeded ++ if (gt(m_read_data,thres->LowMinor)) { ++ CreateThresholdEvent(SAHPI_ES_LOWER_MINOR,SAHPI_TRUE); ++ m_event_data |= SAHPI_ES_LOWER_MINOR; ++ } ++ } ++ } ++ ++ if (thres->LowMajor.IsSupported) { ++ if (m_event_data & SAHPI_ES_LOWER_MAJOR) { ++ // See if the threshold is no longer exceeded ++ if (lt(m_read_data,thres->LowMajor)) { ++ CreateThresholdEvent(SAHPI_ES_LOWER_MAJOR,SAHPI_FALSE); ++ m_event_data &= ~SAHPI_ES_LOWER_MAJOR; ++ } ++ ++ } ++ else { ++ // See if the threshold is exceeded ++ if (gt(m_read_data,thres->LowMajor)) { ++ CreateThresholdEvent(SAHPI_ES_LOWER_MAJOR,SAHPI_TRUE); ++ m_event_data |= SAHPI_ES_LOWER_MAJOR; ++ } ++ } ++ } ++ ++ if (thres->LowCritical.IsSupported) { ++ if (m_event_data & SAHPI_ES_LOWER_CRIT) { ++ // See if the threshold is no longer exceeded ++ if (lt(m_read_data,thres->LowCritical)) { ++ CreateThresholdEvent(SAHPI_ES_LOWER_CRIT,SAHPI_FALSE); ++ m_event_data &= ~SAHPI_ES_LOWER_CRIT; ++ } ++ } ++ else { ++ // See if the threshold is exceeded ++ if (gt(m_read_data,thres->LowCritical)) { ++ CreateThresholdEvent(SAHPI_ES_LOWER_CRIT,SAHPI_TRUE); ++ m_event_data |= SAHPI_ES_LOWER_CRIT; ++ } ++ } ++ } ++ ++ ++ return SA_OK; ++} ++ + /** + * Check whether the setting of one threshold value is allowed + * +diff -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 +--- openhpi-3.0.0/plugins/dynamic_simulator/new_sim_sensor_threshold.h 2011-10-17 13:57:23.000000000 -0200 ++++ openhpi-3.0.0.oc/plugins/dynamic_simulator/new_sim_sensor_threshold.h 2012-01-10 14:17:33.000000000 -0200 +@@ -73,6 +73,13 @@ + // create an RDR sensor record + virtual bool CreateRdr( SaHpiRptEntryT &resource, SaHpiRdrT &rdr ); + ++ // Check to see if changing the thresholds to the passed values ++ // would result in an error. If so, raise the appropriate event. ++ SaErrorT CheckThresholdsAndPublishEvents(const SaHpiSensorThresholdsT* newThres); ++ ++ // Create a threshold event ++ void CreateThresholdEvent(SaHpiEventStateT theActualEvent, SaHpiBoolT asserted); ++ + // official hpi functions + + // 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 @@ +Index: openhpi-3.2.1/configure.ac +=================================================================== +--- openhpi-3.2.1.orig/configure.ac ++++ openhpi-3.2.1/configure.ac +@@ -173,7 +173,7 @@ AC_CHECK_HEADERS([openssl/md2.h openssl/ + + dnl xml is used for XML-based communication in ilo2_ribcl and oa_soap + AC_CHECK_LIB([xml2],[xmlParseMemory],[XML2_LIB=-lxml2],[XML2_LIB=]) +-AC_CHECK_HEADERS([libxml2/libxml/xmlexports.h],[XML2_INCLUDE="-I/usr/include/libxml2"],[XML2_INCLUDE]) ++AC_CHECK_HEADERS([libxml/xmlexports.h]) + AC_SUBST(XML2_LIB) + AC_SUBST(XML2_INCLUDE) + 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 @@ +DESCRIPTION = "This is the OpenIPMI library, a library that makes simplifies building complex IPMI management software." +SECTION = "console/network" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=e3c772a32386888ccb5ae1c0ba95f1a4" +DEPENDS = "openssl zlib net-snmp sysfsutils" + +INC_PR = "r0" + +inherit autotools gettext update-alternatives + +EXTRA_OECONF = "--with-libxml2=${STAGING_LIBDIR}/.. --with-net-snmp-config=${STAGING_BINDIR}/net-snmp-config" + +FILES_${PN} += "${libdir}/${PN}/*" + +INSANE_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 @@ +PR = "${INC_PR}.0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/openhpi/openhpi-${PV}.tar.gz \ + file://openhpi_openclovis.patch \ + file://my_changes.patch \ + file://xml.patch \ + " +SRC_URI[md5sum] = "9089cb59b732ff00b3805a1809405b4b" +SRC_URI[sha256sum] = "2af5f40040a1b99b0c0a60f1bc03505d3d51f5c445cd04b1f832eb060acbb227" + +require 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 @@ +diff --git a/unix/Makefile.am b/unix/Makefile.am +index a792147..a108bc6 100644 +--- a/unix/Makefile.am ++++ b/unix/Makefile.am +@@ -11,13 +11,13 @@ libOpenIPMIpthread_la_SOURCES = posix_thread_os_hnd.c selector.c + libOpenIPMIpthread_la_LIBADD = -lpthread $(GDBM_LIB) \ + $(top_builddir)/utils/libOpenIPMIutils.la + libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ +- -Wl,-Map -Wl,libOpenIPMIpthread.map -L$(libdir) ++ -Wl,-Map -Wl,libOpenIPMIpthread.map + + libOpenIPMIposix_la_SOURCES = posix_os_hnd.c selector.c + libOpenIPMIposix_la_LIBADD = $(top_builddir)/utils/libOpenIPMIutils.la \ + $(GDBM_LIB) + libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ +- -Wl,-Map -Wl,libOpenIPMIposix.map -L$(libdir) ++ -Wl,-Map -Wl,libOpenIPMIposix.map + + noinst_HEADERS = heap.h + 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 @@ +diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am +index e80090d..b59ff24 100644 +--- a/cmdlang/Makefile.am ++++ b/cmdlang/Makefile.am +@@ -16,7 +16,7 @@ libOpenIPMIcmdlang_la_LIBADD = -lm \ + $(top_builddir)/utils/libOpenIPMIutils.la \ + $(top_builddir)/lib/libOpenIPMI.la + libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ +- -Wl,-Map -Wl,libOpenIPMIcmdlang.map -L$(libdir) ++ -Wl,-Map -Wl,libOpenIPMIcmdlang.map + + bin_PROGRAMS = openipmish + 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 @@ +diff --git a/glib/Makefile.am b/glib/Makefile.am +index 671cae2..eff55f3 100644 +--- a/glib/Makefile.am ++++ b/glib/Makefile.am +@@ -11,14 +11,14 @@ libOpenIPMIglib_la_SOURCES = glib_os_hnd.c + libOpenIPMIglib_la_CFLAGS = $(GLIB_CFLAGS) $(AM_CFLAGS) + libOpenIPMIglib_la_LIBADD = $(GDBM_LIB) + libOpenIPMIglib_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ +- -Wl,-Map -Wl,libOpenIPMIglib.map $(GLIB_LIBS) -L$(libdir) \ ++ -Wl,-Map -Wl,libOpenIPMIglib.map $(GLIB_LIBS) \ + -rpath $(libdir) + + libOpenIPMIglib12_la_SOURCES = glib_os_hnd.c + libOpenIPMIglib12_la_CFLAGS = $(GLIB12_CFLAGS) $(AM_CFLAGS) + libOpenIPMIglib12_la_LIBADD = $(GDBM_LIB) + libOpenIPMIglib12_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ +- -Wl,-Map -Wl,libOpenIPMIglib12.map $(GLIB12_LIBS) -L$(libdir) \ ++ -Wl,-Map -Wl,libOpenIPMIglib12.map $(GLIB12_LIBS) \ + -rpath $(libdir) + + 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 @@ +diff --git a/tcl/Makefile.am b/tcl/Makefile.am +index b702819..282619c 100644 +--- a/tcl/Makefile.am ++++ b/tcl/Makefile.am +@@ -11,7 +11,7 @@ libOpenIPMItcl_la_SOURCES = tcl_os_hnd.c + libOpenIPMItcl_la_CFLAGS = $(TCL_CFLAGS) $(AM_CFLAGS) + libOpenIPMItcl_la_LIBADD = $(GDBM_LIB) + libOpenIPMItcl_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ +- -Wl,-Map -Wl,libOpenIPMItcl.map $(TCL_LIBS) -L$(libdir) \ ++ -Wl,-Map -Wl,libOpenIPMItcl.map $(TCL_LIBS) \ + -rpath $(libdir) + + 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 @@ +DESCRIPTION = "This is the OpenIPMI library, a library that makes simplifies building complex IPMI management software." +SECTION = "console/network" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +DEPENDS = "openssl popt zlib" + +INC_PR = "r0" + +inherit autotools gettext update-alternatives + +EXTRA_OECONF = "\ + --prefix=${prefix} \ + --without-python \ + ${@base_contains("OPENCLOVIS_FEATURES_ENABLE", "snmp", "--with-ucdsnmp=no", "", d)} \ + " + +S = "${WORKDIR}/OpenIPMI-${PV}" + +PARALLEL_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 @@ +PR = "${INC_PR}.0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/openipmi/OpenIPMI-${PV}.tar.gz \ + file://makefile.patch \ + file://makefile_glib.patch \ + file://makefile_cmdlang.patch \ + file://makefile_tcl.patch \ + " +SRC_URI[md5sum] = "dc0b42ae40b3f1d0db2a94b75b95fae1" +SRC_URI[sha256sum] = "37b844d02119b94b31e2bb2bd8062ffdf6cd3eb4bc75fa6c47184e8b14fe95b8" + +require 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 @@ +# +# +# + +SUMMARY = "SAFplus Base Packages" +DESCRIPTION = "Packages required to satisfy the Open Clovis SAFplus" +PR = "r0" +LICENSE = "MIT" + +inherit packagegroup + +OPENCLOVIS_FEATURES_ENABLE ?= "snmp hpi" + +PACKAGES = "\ + packagegroup-saf-base \ + packagegroup-saf-snmp \ + packagegroup-saf-hpi \ + " + +SUMMARY_packagegroup-saf-base = "SAF Base" +DESCRIPTION_packagegroup-saf-base = "Packages required to support SAF frameworks" +RDEPENDS_packagegroup-saf-base = "\ + sqlite3 \ + glib-2.0 \ + gdbm \ + tipcutils \ + ${@base_contains("OPENCLOVIS_FEATURES_ENABLE", "snmp", "packagegroup-saf-snmp", "", d)} \ + ${@base_contains("OPENCLOVIS_FEATURES_ENABLE", "hpi", "packagegroup-saf-hpi", "", d)} \ + " + +SUMMARY_packagegroup-saf-snmp = "SAF SNMP support" +DESCRIPTION_packagegroup-saf-snmp = "Packages required to support SAF frameworks with SNMP" +RDEPENDS_packagegroup-saf-snmp = "\ + net-snmp-libs \ + net-snmp-server \ + " + +SUMMARY_packagegroup-saf-hpi = "SAF HPI support" +DESCRIPTION_packagegroup-saf-hpi = "Packages required to support SAF frameworks with HPI" +RDEPENDS_packagegroup-saf-hpi = "\ + openhpi \ + openipmi \ + ${@base_contains("OPENCLOVIS_FEATURES_ENABLE", "snmp", "openhpi-subagent", "", d)} \ + " 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 @@ +DESCRIPTION = "The canonical example of init scripts" +SECTION = "base" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +PR = "r0" + +DEPENDS = "sqlite3 glib-2.0 gdbm" +RDEPENDS_${PN} = "sqlite3 glib-2.0 gdbm" +RPROVIDES_${PN} += "libClUtils.so libmw.so libClDbal.so" + +SRC_URI = "git://github.com/OpenClovis/SAFplus-Availability-Scalability-Platform" + +inherit autotools + +S = "${WORKDIR}/${BP}/src/SAFplus" + +OC_SDK = "${WORKDIR}/clovis" +OC_ASP_BUILD = "${WORKDIR}/asp_build" + +OC_TARGET_DIR = "${prefix}/target/${TARGET_ARCH}/${TARGET_OS}" + +EXTRA_OECONF = " \ + --with-sdk-dir=${OC_SDK} \ + --with-safplus-build \ + --without-snmp-build \ + --prefix=${D}${prefix} \ + " + +do_configure () { + + mkdir -p ${OC_SDK}/6.1/sdk + mkdir -p ${OC_SDK}/6.1/buildtools/yocto + mkdir -p ${OC_ASP_BUILD} + cd ${OC_ASP_BUILD} + + TARGET=${TARGET_OS} \ + ARCH=${TARGET_ARCH} \ + MARCH=${TARGET_ARCH} \ + ${S}/configure ${EXTRA_OECONF} +} + +do_compile () { + + cd ${OC_ASP_BUILD}/asp/build/local + make + +} + +do_install () { + cd ${OC_ASP_BUILD}/asp/build/local + make safplus-install +} + +INSANE_SKIP_${PN} += "dev-so libdir" +INSANE_SKIP_${PN}-dbg += "libdir" + +FILES_${PN}-dbg += " ${OC_TARGET_DIR}/lib/.debug ${OC_TARGET_DIR}/lib/shared-*/.debug" +FILES_${PN}-staticdev += " ${OC_TARGET_DIR}/lib/*.a" +FILES_${PN} += " ${OC_TARGET_DIR}" -- cgit v1.2.3-54-g00ecf