ChangeLogTag: Wed Nov 3 07:13:19 2004 Chad Elliott <elliott_c@ociweb.com>

6 files changed, 7 insertions, 12 deletions

diff --git a/ASNMP/asnmp/address.cpp b/ASNMP/asnmp/address.cpp
index d5a72aad750..e2fead24981 100644
--- a/ASNMP/asnmp/address.cpp
+++ b/ASNMP/asnmp/address.cpp
@@ -527,7 +527,6 @@ int IpAddress::parse_address( const char *inaddr)
 
         // save the friendly name
         ACE_OS::strcpy( iv_friendly_name_, inaddr);
-        return 1;
 
     }    // end if lookup result
     else {
diff --git a/ASNMP/asnmp/octet.cpp b/ASNMP/asnmp/octet.cpp
index 795aa39210b..885197919c4 100644
--- a/ASNMP/asnmp/octet.cpp
+++ b/ASNMP/asnmp/octet.cpp
@@ -84,7 +84,6 @@ OctetStr::OctetStr( const char  * string, long size):
   output_buffer(0), validity(0)
 {
 
-  size_t z;
   init_octet_smi(smival);
 
   // check for null string
@@ -92,7 +91,7 @@ OctetStr::OctetStr( const char  * string, long size):
     return;
 
   if (size == -1) // calc if no length given - assume c style string
-    size = z = ACE_OS::strlen( string);
+    size = ACE_OS::strlen( string);
 
   copy_octet_smi(smival, size, string, validity);
 }
@@ -102,8 +101,6 @@ OctetStr::OctetStr( const char  * string, long size):
 // TODO: should return status since it can fail in so many places
 void OctetStr::set_data( const SmiBYTE* string, long size)
 {
-  size_t z;
-
   // invalid args, set octetStr to not valid
   if ( !string || !size) {
     validity = 0;
@@ -112,7 +109,7 @@ void OctetStr::set_data( const SmiBYTE* string, long size)
 
   // assume non-zero terminated string
   if (size == -1) // calc if no length given - assume c style string
-    size = z = ACE_OS::strlen( (char *)string);
+    size = ACE_OS::strlen( (char *)string);
 
   // free up already used space
   if ( smival.value.string.ptr ) {
diff --git a/ASNMP/asnmp/oid.cpp b/ASNMP/asnmp/oid.cpp
index d632df361ed..b5999a1fcbd 100644
--- a/ASNMP/asnmp/oid.cpp
+++ b/ASNMP/asnmp/oid.cpp
@@ -187,8 +187,8 @@ Oid& Oid::operator=( const Oid &oid)
   if ( oid.smival.value.oid.len == 0)
      return *this;
 
-  init_value((const SmiLPOID) &(oid.smival.value.oid),
-                 oid.smival.value.oid.len);
+  const SmiLPOID srcOid = (SmiLPOID) &(oid.smival.value.oid);
+  init_value(srcOid, oid.smival.value.oid.len);
   return *this;
 }
 
diff --git a/ASNMP/asnmp/oid.h b/ASNMP/asnmp/oid.h
index fd198c04073..7de02013ef4 100644
--- a/ASNMP/asnmp/oid.h
+++ b/ASNMP/asnmp/oid.h
@@ -117,7 +117,7 @@ public:
   void trim( const size_t how_many = 1);
   // trim off the n rightmost values of an oid
 
-  int suboid(Oid& oid, size_t start = 0, size_t how_many = -1);
+  int suboid(Oid& oid, size_t start = 0, size_t how_many = size_t (-1));
   // the equivalent of a substr(new_str, 0, 1)
 
   int left_comparison( const unsigned long n, const Oid &o) const;
diff --git a/ASNMP/asnmp/smival.h b/ASNMP/asnmp/smival.h
index 45911d21246..c9de5701651 100644
--- a/ASNMP/asnmp/smival.h
+++ b/ASNMP/asnmp/smival.h
@@ -88,7 +88,7 @@ public:
   virtual ~SnmpSyntax() {};
   // virtual destructor to ensure deletion of derived classes...
 
-  virtual SnmpSyntax& operator=( SnmpSyntax &/*val*/)
+  virtual SnmpSyntax& operator=(const SnmpSyntax &/*val*/)
   {
       return *this;
   }
diff --git a/ASNMP/asnmp/transaction.cpp b/ASNMP/asnmp/transaction.cpp
index 1396ea3e488..2964ff8a1f2 100644
--- a/ASNMP/asnmp/transaction.cpp
+++ b/ASNMP/asnmp/transaction.cpp
@@ -140,8 +140,7 @@ int transaction::handle_input (ACE_HANDLE)
 int transaction::handle_timeout(const ACE_Time_Value &,
                                 const void *)
 {
-    int rc;
-    if ((rc = send()) < 0)      // send pkt to agent
+    if (send() < 0)      // send pkt to agent
         result_->result(this, 0);
     else
         if (retry_counter_++ > params_.get_retry())