[svn-commits] jeffg: branch jeffg/jeffg-moresnmp-branch r180677 - /team/jeffg/jeffg-moresnm...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Sat Mar 7 13:29:45 CST 2009
Author: jeffg
Date: Sat Mar 7 13:29:42 2009
New Revision: 180677
URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=180677
Log:
res_snmp rework: clean up new astIndicationsTable, now compiles cleanly
Modified:
team/jeffg/jeffg-moresnmp-branch/res/snmp/mib_tables/astIndicationsTable/astIndicationsTable.c
team/jeffg/jeffg-moresnmp-branch/res/snmp/mib_tables/astIndicationsTable/astIndicationsTable_data_access.c
team/jeffg/jeffg-moresnmp-branch/res/snmp/mib_tables/astIndicationsTable/astIndicationsTable_data_get.c
team/jeffg/jeffg-moresnmp-branch/res/snmp/mib_tables/astIndicationsTable/astIndicationsTable_data_set.c
team/jeffg/jeffg-moresnmp-branch/res/snmp/mib_tables/astIndicationsTable/astIndicationsTable_interface.c
Modified: team/jeffg/jeffg-moresnmp-branch/res/snmp/mib_tables/astIndicationsTable/astIndicationsTable.c
URL: http://svn.digium.com/svn-view/asterisk/team/jeffg/jeffg-moresnmp-branch/res/snmp/mib_tables/astIndicationsTable/astIndicationsTable.c?view=diff&rev=180677&r1=180676&r2=180677
==============================================================================
--- team/jeffg/jeffg-moresnmp-branch/res/snmp/mib_tables/astIndicationsTable/astIndicationsTable.c (original)
+++ team/jeffg/jeffg-moresnmp-branch/res/snmp/mib_tables/astIndicationsTable/astIndicationsTable.c Sat Mar 7 13:29:42 2009
@@ -14,6 +14,7 @@
* \author Jeff Gehlbach <jeffg at opennms.org>
*/
+#include "asterisk.h"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
/*
Modified: team/jeffg/jeffg-moresnmp-branch/res/snmp/mib_tables/astIndicationsTable/astIndicationsTable_data_access.c
URL: http://svn.digium.com/svn-view/asterisk/team/jeffg/jeffg-moresnmp-branch/res/snmp/mib_tables/astIndicationsTable/astIndicationsTable_data_access.c?view=diff&rev=180677&r1=180676&r2=180677
==============================================================================
--- team/jeffg/jeffg-moresnmp-branch/res/snmp/mib_tables/astIndicationsTable/astIndicationsTable_data_access.c (original)
+++ team/jeffg/jeffg-moresnmp-branch/res/snmp/mib_tables/astIndicationsTable/astIndicationsTable_data_access.c Sat Mar 7 13:29:42 2009
@@ -14,6 +14,7 @@
* \author Jeff Gehlbach <jeffg at opennms.org>
*/
+#include "asterisk.h"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
/*
@@ -34,8 +35,7 @@
#include "astIndicationsTable_data_access.h"
/* Asterisk includes */
-#include "../../res_snmp_common.h"
-#include "asterisk.h"
+#include "asterisk/linkedlists.h"
#include "asterisk/indications.h"
/** @ingroup interface
@@ -253,12 +253,12 @@
*/
if ((NULL == rowreq_ctx->data.astIndCountry) ||
(rowreq_ctx->data.astIndCountry_len <
- (astIndCountry_len* strlen(tz->country)))) {
+ (strlen(tz->country)))) {
snmp_log(LOG_ERR,"not enough space for value\n");
return MFD_ERROR;
}
- rowreq_ctx->data.astIndCountry_len = astIndCountry_len* strlen(tz->country);
- memcpy( rowreq_ctx->data.astIndCountry, tz->country, astIndCountry_len* strlen(tz->country) );
+ rowreq_ctx->data.astIndCountry_len = strlen(tz->country);
+ memcpy( rowreq_ctx->data.astIndCountry, tz->country, strlen(tz->country) );
/*
* setup/save data for astIndAlias
@@ -270,12 +270,12 @@
*/
if ((NULL == rowreq_ctx->data.astIndAlias) ||
(rowreq_ctx->data.astIndAlias_len <
- (astIndAlias_len* strlen(tz->alias)))) {
+ (strlen(tz->alias)))) {
snmp_log(LOG_ERR,"not enough space for value\n");
return MFD_ERROR;
}
- rowreq_ctx->data.astIndAlias_len = astIndAlias_len* strlen(tz->alias);
- memcpy( rowreq_ctx->data.astIndAlias, tz->alias, astIndAlias_len* strlen(tz->alias) );
+ rowreq_ctx->data.astIndAlias_len = strlen(tz->alias);
+ memcpy( rowreq_ctx->data.astIndAlias, tz->alias, strlen(tz->alias) );
/*
* setup/save data for astIndDescription
@@ -287,12 +287,12 @@
*/
if ((NULL == rowreq_ctx->data.astIndDescription) ||
(rowreq_ctx->data.astIndDescription_len <
- (astIndDescription_len* strlen(tz->description)))) {
+ (strlen(tz->description)))) {
snmp_log(LOG_ERR,"not enough space for value\n");
return MFD_ERROR;
}
- rowreq_ctx->data.astIndDescription_len = astIndDescription_len* strlen(tz->description);
- memcpy( rowreq_ctx->data.astIndDescription, tz->description, astIndDescription_len* strlen(tz->description) );
+ rowreq_ctx->data.astIndDescription_len = strlen(tz->description);
+ memcpy( rowreq_ctx->data.astIndDescription, tz->description, strlen(tz->description) );
/*
Modified: team/jeffg/jeffg-moresnmp-branch/res/snmp/mib_tables/astIndicationsTable/astIndicationsTable_data_get.c
URL: http://svn.digium.com/svn-view/asterisk/team/jeffg/jeffg-moresnmp-branch/res/snmp/mib_tables/astIndicationsTable/astIndicationsTable_data_get.c?view=diff&rev=180677&r1=180676&r2=180677
==============================================================================
--- team/jeffg/jeffg-moresnmp-branch/res/snmp/mib_tables/astIndicationsTable/astIndicationsTable_data_get.c (original)
+++ team/jeffg/jeffg-moresnmp-branch/res/snmp/mib_tables/astIndicationsTable/astIndicationsTable_data_get.c Sat Mar 7 13:29:42 2009
@@ -14,6 +14,7 @@
* \author Jeff Gehlbach <jeffg at opennms.org>
*/
+#include "asterisk.h"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
/*
Modified: team/jeffg/jeffg-moresnmp-branch/res/snmp/mib_tables/astIndicationsTable/astIndicationsTable_data_set.c
URL: http://svn.digium.com/svn-view/asterisk/team/jeffg/jeffg-moresnmp-branch/res/snmp/mib_tables/astIndicationsTable/astIndicationsTable_data_set.c?view=diff&rev=180677&r1=180676&r2=180677
==============================================================================
--- team/jeffg/jeffg-moresnmp-branch/res/snmp/mib_tables/astIndicationsTable/astIndicationsTable_data_set.c (original)
+++ team/jeffg/jeffg-moresnmp-branch/res/snmp/mib_tables/astIndicationsTable/astIndicationsTable_data_set.c Sat Mar 7 13:29:42 2009
@@ -14,6 +14,7 @@
* \author Jeff Gehlbach <jeffg at opennms.org>
*/
+#include "asterisk.h"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
/*
Modified: team/jeffg/jeffg-moresnmp-branch/res/snmp/mib_tables/astIndicationsTable/astIndicationsTable_interface.c
URL: http://svn.digium.com/svn-view/asterisk/team/jeffg/jeffg-moresnmp-branch/res/snmp/mib_tables/astIndicationsTable/astIndicationsTable_interface.c?view=diff&rev=180677&r1=180676&r2=180677
==============================================================================
--- team/jeffg/jeffg-moresnmp-branch/res/snmp/mib_tables/astIndicationsTable/astIndicationsTable_interface.c (original)
+++ team/jeffg/jeffg-moresnmp-branch/res/snmp/mib_tables/astIndicationsTable/astIndicationsTable_interface.c Sat Mar 7 13:29:42 2009
@@ -14,6 +14,7 @@
* \author Jeff Gehlbach <jeffg at opennms.org>
*/
+#include "asterisk.h"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
/*
More information about the svn-commits
mailing list