[PATCH] get_value() returns SNMP_CLASS_INVALID if there was an exception.

[Dominik Vogt]

---
 src/vb.cpp |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/vb.cpp b/src/vb.cpp
index 9722d80..e8d760c 100644
--- a/src/vb.cpp
+++ b/src/vb.cpp
@@ -125,7 +125,7 @@ int Vb::get_value(int &i) const
 {
    if (iv_vb_value &&
        iv_vb_value->valid() &&
-       (iv_vb_value->get_syntax() == sNMP_SYNTAX_INT32 ))
+       (get_syntax() == sNMP_SYNTAX_INT32 ))
    {
      long lval;
      lval = *((SnmpInt32 *)iv_vb_value);// SnmpInt32 includes cast to long,
@@ -141,10 +141,10 @@ int Vb::get_value(unsigned int &i) const
 {
   if (iv_vb_value &&
       iv_vb_value->valid() &&
-      ((iv_vb_value->get_syntax() == sNMP_SYNTAX_UINT32 ) ||
-       (iv_vb_value->get_syntax() == sNMP_SYNTAX_CNTR32 ) ||
-       (iv_vb_value->get_syntax() == sNMP_SYNTAX_GAUGE32 ) ||
-       (iv_vb_value->get_syntax() == sNMP_SYNTAX_TIMETICKS )))
+      ((get_syntax() == sNMP_SYNTAX_UINT32 ) ||
+       (get_syntax() == sNMP_SYNTAX_CNTR32 ) ||
+       (get_syntax() == sNMP_SYNTAX_GAUGE32 ) ||
+       (get_syntax() == sNMP_SYNTAX_TIMETICKS )))
   {
     unsigned long lval;
     lval = *((SnmpUInt32 *)iv_vb_value);
@@ -162,7 +162,7 @@ int Vb::get_value(long &i) const
 {
    if (iv_vb_value &&
        iv_vb_value->valid() &&
-       (iv_vb_value->get_syntax() == sNMP_SYNTAX_INT32 ))
+       (get_syntax() == sNMP_SYNTAX_INT32 ))
    {
      i = *((SnmpInt32 *)iv_vb_value);	// SnmpInt32 includes cast to long
      return SNMP_CLASS_SUCCESS;
@@ -178,10 +178,10 @@ int Vb::get_value(unsigned long &i) const
 {
   if (iv_vb_value &&
       iv_vb_value->valid() &&
-      ((iv_vb_value->get_syntax() == sNMP_SYNTAX_UINT32 ) ||
-       (iv_vb_value->get_syntax() == sNMP_SYNTAX_CNTR32 ) ||
-       (iv_vb_value->get_syntax() == sNMP_SYNTAX_GAUGE32 ) ||
-       (iv_vb_value->get_syntax() == sNMP_SYNTAX_TIMETICKS )))
+      ((get_syntax() == sNMP_SYNTAX_UINT32 ) ||
+       (get_syntax() == sNMP_SYNTAX_CNTR32 ) ||
+       (get_syntax() == sNMP_SYNTAX_GAUGE32 ) ||
+       (get_syntax() == sNMP_SYNTAX_TIMETICKS )))
   {
     i = *((SnmpUInt32 *)iv_vb_value);	// SnmpUint32 has includes to ulong
     return SNMP_CLASS_SUCCESS;
@@ -201,7 +201,7 @@ int Vb::get_value(unsigned char *ptr, unsigned long &len) const
 {
   if (iv_vb_value &&
       iv_vb_value->valid() &&
-      (iv_vb_value->get_syntax() == sNMP_SYNTAX_OCTETS))
+      (get_syntax() == sNMP_SYNTAX_OCTETS))
   {
     OctetStr *p_os = (OctetStr *)iv_vb_value;
     len = p_os->len();
@@ -224,7 +224,7 @@ int Vb::get_value(unsigned char *ptr, unsigned long &len,
 {
   if (iv_vb_value &&
       iv_vb_value->valid() &&
-      (iv_vb_value->get_syntax() == sNMP_SYNTAX_OCTETS) &&
+      (get_syntax() == sNMP_SYNTAX_OCTETS) &&
       (maxlen > 0))
   {
     OctetStr *p_os = (OctetStr *)iv_vb_value;
@@ -269,7 +269,7 @@ int Vb::get_value(char *ptr) const
 {
   if (iv_vb_value &&
       iv_vb_value->valid() &&
-      (iv_vb_value->get_syntax() == sNMP_SYNTAX_OCTETS))
+      (get_syntax() == sNMP_SYNTAX_OCTETS))
   {
     OctetStr *p_os = (OctetStr *)iv_vb_value;
     unsigned long len = p_os->len();
-- 
1.5.5.6


--3MwIy2ne0vdjdPXF--