summaryrefslogtreecommitdiff
path: root/ACE/ASNMP/asnmp
diff options
context:
space:
mode:
Diffstat (limited to 'ACE/ASNMP/asnmp')
-rw-r--r--ACE/ASNMP/asnmp/address.cpp10
-rw-r--r--ACE/ASNMP/asnmp/address.h4
-rw-r--r--ACE/ASNMP/asnmp/asn1.cpp7
-rw-r--r--ACE/ASNMP/asnmp/asn1.h2
-rw-r--r--ACE/ASNMP/asnmp/gauge.cpp1
-rw-r--r--ACE/ASNMP/asnmp/octet.cpp1
-rw-r--r--ACE/ASNMP/asnmp/oid.cpp1
-rw-r--r--ACE/ASNMP/asnmp/pdu.cpp6
-rw-r--r--ACE/ASNMP/asnmp/target.h1
-rw-r--r--ACE/ASNMP/asnmp/transaction.cpp1
-rw-r--r--ACE/ASNMP/asnmp/vb.cpp1
-rw-r--r--ACE/ASNMP/asnmp/wpdu.cpp4
-rw-r--r--ACE/ASNMP/asnmp/wpdu.h1
13 files changed, 0 insertions, 40 deletions
diff --git a/ACE/ASNMP/asnmp/address.cpp b/ACE/ASNMP/asnmp/address.cpp
index b4a64b327c2..001337d36f3 100644
--- a/ACE/ASNMP/asnmp/address.cpp
+++ b/ACE/ASNMP/asnmp/address.cpp
@@ -127,7 +127,6 @@ bool operator<=( const Address &lhs,const Address &rhs)
return true;
else
return false;
-
}
@@ -249,7 +248,6 @@ IpAddress::IpAddress( const char *inaddr): Address()
smival.value.string.ptr = address_buffer;
if (ACE_OS::strlen(inaddr) == 0) {
-
valid_flag = 0;
iv_friendly_name_[0] = 0;
iv_friendly_name_status_ = 0;
@@ -505,7 +503,6 @@ int IpAddress::parse_address( const char *inaddr)
// is this a dotted IP notation string or
// a friendly name
if ( parse_dotted_ipstring( inaddr)) {
-
// since this is a valid dotted string
// don't do any DNS (Performance!)
return 1;
@@ -513,7 +510,6 @@ int IpAddress::parse_address( const char *inaddr)
else {
int rc;
if ((rc = resolve_to_address(inaddr, ipAddr)) == 0) {
-
// now lets check out the dotted string
ACE_OS::strncpy( ds, ACE_OS::inet_ntoa(ipAddr), MAXHOSTNAMELEN);
@@ -522,7 +518,6 @@ int IpAddress::parse_address( const char *inaddr)
// save the friendly name
ACE_OS::strcpy( iv_friendly_name_, inaddr);
-
} // end if lookup result
else {
iv_friendly_name_status_ = rc;
@@ -570,7 +565,6 @@ int IpAddress::resolve_to_hostname(const in_addr& quad_addr, char *hostname)
// reverse lookup (requires in-addr.arpa to be setup in DNS
if (ACE_OS::gethostbyaddr_r((const char *)&quad_addr.s_addr, IPV4LEN,
AF_INET, &lookupResult, buffer, &loc_errno)) {
-
// verify right type of record
if (lookupResult.h_addrtype == AF_INET &&
lookupResult.h_length == IPV4LEN) {
@@ -1009,7 +1003,6 @@ void NetbiosAddress::InitNBAddr(const char *inaddr)
NetbiosAddress::NetbiosAddress( const char *inaddr)
{
InitNBAddr(inaddr);
-
}
NetbiosAddress::NetbiosAddress( const char *inaddr, nb_service svc)
@@ -1714,7 +1707,6 @@ int IpxSockAddress::parse_address( const char *inaddr)
}
-
//-------------[ set the socket number ]----------------------------------
void IpxSockAddress::set_socket( const unsigned short s)
{
@@ -1839,7 +1831,6 @@ MacAddress& MacAddress::operator=( const MacAddress &macaddress)
}
-
//-----[ MAC Address general = operator ]---------------------------------
SnmpSyntax& MacAddress::operator=( SnmpSyntax &val)
{
@@ -2364,7 +2355,6 @@ int GenAddress::parse_address( const char *addr)
return 1; // ok, its a mac
}
break;
-
}
// otherwise its invalid
delete address;
diff --git a/ACE/ASNMP/asnmp/address.h b/ACE/ASNMP/asnmp/address.h
index a46ddb66691..d6a5cae8736 100644
--- a/ACE/ASNMP/asnmp/address.h
+++ b/ACE/ASNMP/asnmp/address.h
@@ -101,7 +101,6 @@ class SIPAddress; // aka ipv6
*/
class ASNMP_Export Address: public SnmpSyntax
{
-
public:
/// allow destruction of derived classes
virtual ~Address();
@@ -294,7 +293,6 @@ protected:
/// thread safe routine to lookup name given ip address
/// return <> 0 on error
static int resolve_to_hostname(const in_addr& quad_addr, char *hostname);
-
};
//------------------------------------------------------------------------
@@ -477,7 +475,6 @@ protected:
class ASNMP_Export NetbiosAddress : public Address
{
public:
-
/// default constructor with string arg
NetbiosAddress( const char *inaddr = "");
@@ -704,7 +701,6 @@ protected:
};
-
//------------------------------------------------------------------------
//---------[ IpxSock Address Class ]--------------------------------------
//------------------------------------------------------------------------
diff --git a/ACE/ASNMP/asnmp/asn1.cpp b/ACE/ASNMP/asnmp/asn1.cpp
index a0f1eb1cb40..e5c8ad90171 100644
--- a/ACE/ASNMP/asnmp/asn1.cpp
+++ b/ACE/ASNMP/asnmp/asn1.cpp
@@ -418,7 +418,6 @@ u_char * asn1::build_header( u_char *data,
*data++ = type;
(*datalength)--;
return asn1::build_length(data, datalength, length);
-
}
/*
@@ -519,7 +518,6 @@ u_char *asn1::build_length( u_char *data,
}
*datalength -= (data - start_data);
return data;
-
}
/*
@@ -951,7 +949,6 @@ u_char * asn1::build_unsigned_int64( u_char *data,
high = (high << 8)
| ((low & mask) >> (8 * (sizeof(long) - 1)));
low <<= 8;
-
}
return data;
}
@@ -1084,7 +1081,6 @@ void cmu_snmp::add_var(struct snmp_pdu *pdu,
break;
-
case sNMP_SYNTAX_TIMETICKS:
case sNMP_SYNTAX_CNTR32:
case sNMP_SYNTAX_GAUGE32:
@@ -1125,7 +1121,6 @@ void cmu_snmp::add_var(struct snmp_pdu *pdu,
sizeof( SmiCNTR64));
}
break;
-
} // end switch
}
@@ -1316,7 +1311,6 @@ int cmu_snmp::build( struct snmp_pdu *pdu, u_char *packet,
length = *out_length;
if (pdu->command != TRP_REQ_MSG) {
-
// request id
cp = asn1::build_int( packet,
&length,
@@ -1521,7 +1515,6 @@ cmu_snmp::parse_var_op( u_char *data, oid *var_name,
}
-
// build a pdu from a data and length
int cmu_snmp::parse( struct snmp_pdu *pdu,
u_char *data,
diff --git a/ACE/ASNMP/asnmp/asn1.h b/ACE/ASNMP/asnmp/asn1.h
index c06f9d23d72..f2d7d309905 100644
--- a/ACE/ASNMP/asnmp/asn1.h
+++ b/ACE/ASNMP/asnmp/asn1.h
@@ -262,7 +262,6 @@ static unsigned char * build_unsigned_int64( unsigned char *data,
unsigned char type,
struct counter64 *cp,
int countersize);
-
};
@@ -334,7 +333,6 @@ static unsigned char *parse_var_op( unsigned char *data,
int *var_val_len,
unsigned char **var_val,
int *listlength);
-
};
#endif // ASN1
diff --git a/ACE/ASNMP/asnmp/gauge.cpp b/ACE/ASNMP/asnmp/gauge.cpp
index 9d8e1ed4324..485d002a22f 100644
--- a/ACE/ASNMP/asnmp/gauge.cpp
+++ b/ACE/ASNMP/asnmp/gauge.cpp
@@ -70,7 +70,6 @@ Gauge32& Gauge32::operator=( const unsigned long int i)
// TODO: this is broken if not inherited from UInt32 (see UInt32 code).
SnmpSyntax& Gauge32::operator=( SnmpSyntax &in_val)
{
-
if ( this == &in_val ) // handle assignement from itself
return *this;
diff --git a/ACE/ASNMP/asnmp/octet.cpp b/ACE/ASNMP/asnmp/octet.cpp
index e5803dcf4fe..6a3da66f41d 100644
--- a/ACE/ASNMP/asnmp/octet.cpp
+++ b/ACE/ASNMP/asnmp/octet.cpp
@@ -75,7 +75,6 @@ int copy_octet_smi(SmiVALUE& smi, int size, const char *src, int& valid_flag)
OctetStr::OctetStr( const char * string, long size):
output_buffer(0), validity(0)
{
-
init_octet_smi(smival);
// check for null string
diff --git a/ACE/ASNMP/asnmp/oid.cpp b/ACE/ASNMP/asnmp/oid.cpp
index c5d07161253..156bd8f9472 100644
--- a/ACE/ASNMP/asnmp/oid.cpp
+++ b/ACE/ASNMP/asnmp/oid.cpp
@@ -732,7 +732,6 @@ int Oid::OidToStr( SmiLPOID srcOid, unsigned long size,
// loop through and build up a string
for (index=0; index < srcOid->len; index++) {
-
// convert data element to a string
if (ACE_OS::sprintf( szNumber,"%lu", srcOid->ptr[index]) == -1)
return -1;
diff --git a/ACE/ASNMP/asnmp/pdu.cpp b/ACE/ASNMP/asnmp/pdu.cpp
index 4a05750685a..44740ee54aa 100644
--- a/ACE/ASNMP/asnmp/pdu.cpp
+++ b/ACE/ASNMP/asnmp/pdu.cpp
@@ -129,7 +129,6 @@ Pdu& Pdu::operator=( const Pdu &pdu)
// append operator, appends a string
Pdu& Pdu::operator+=( Vb &vb)
{
-
// do we have room?
if ( vb_count_ + 1 > MAX_VBS)
return *this;
@@ -145,7 +144,6 @@ Pdu& Pdu::operator+=( Vb &vb)
// return self reference
return *this;
-
}
// return fomatted version of this object
@@ -191,13 +189,11 @@ int Pdu::get_vblist( Vb* pvbs, const int pvb_count)
pvbs[z] = *vbs_[z];
return 1;
-
}
//=====================[ deposit Vbs ]===================================
int Pdu::set_vblist( Vb* pvbs, const int pvb_count)
{
-
// if invalid then don't destroy
if ((!pvbs) || ( pvb_count < 0) || ( pvb_count > MAX_VBS))
return 0;
@@ -275,7 +271,6 @@ int Pdu::set_vb( Vb &vb, const int index)
validity_ = 1;
return 1;
-
}
//=====================[ return number of vbs_ ]==========================
@@ -408,7 +403,6 @@ int Pdu::trim(const int p)
}
-
// delete a Vb anywhere within the Pdu
int Pdu::delete_vb( const int p)
{
diff --git a/ACE/ASNMP/asnmp/target.h b/ACE/ASNMP/asnmp/target.h
index c439475fb26..3903f7dde4f 100644
--- a/ACE/ASNMP/asnmp/target.h
+++ b/ACE/ASNMP/asnmp/target.h
@@ -73,7 +73,6 @@ enum ASNMP_Defs {
class ASNMP_Export SnmpTarget
{
public:
-
/// allow destruction of derived classes
virtual ~SnmpTarget();
diff --git a/ACE/ASNMP/asnmp/transaction.cpp b/ACE/ASNMP/asnmp/transaction.cpp
index 48de210c1a2..9081593e4d8 100644
--- a/ACE/ASNMP/asnmp/transaction.cpp
+++ b/ACE/ASNMP/asnmp/transaction.cpp
@@ -63,7 +63,6 @@ int transaction::run()
// register a time handler and a socket with this
while (!done) {
-
if ((rc = this->send()) < 0) // send pkt to agent
return rc;
else {
diff --git a/ACE/ASNMP/asnmp/vb.cpp b/ACE/ASNMP/asnmp/vb.cpp
index 9c3cbedf5dd..59b8c9c2496 100644
--- a/ACE/ASNMP/asnmp/vb.cpp
+++ b/ACE/ASNMP/asnmp/vb.cpp
@@ -325,7 +325,6 @@ int Vb::get_value( SnmpSyntax &val)
}
-
//-----[ misc]--------------------------------------------------------
// return the current syntax
diff --git a/ACE/ASNMP/asnmp/wpdu.cpp b/ACE/ASNMP/asnmp/wpdu.cpp
index aa4ac0e544f..1685d9190d2 100644
--- a/ACE/ASNMP/asnmp/wpdu.cpp
+++ b/ACE/ASNMP/asnmp/wpdu.cpp
@@ -261,7 +261,6 @@ int wpdu::convert_vb_to_smival( Vb &tempvb, SmiVALUE *smival )
smival->syntax = tempvb.get_syntax();
switch ( smival->syntax ) {
-
case sNMP_SYNTAX_NULL:
break;
@@ -411,7 +410,6 @@ int wpdu::restore_vbs(Pdu& pdu, const snmp_pdu *raw_pdu) const
struct variable_list *vp;
for(vp = raw_pdu->variables; vp; vp = vp->next_variable) {
-
// extract the oid portion
tempoid.set_data( (unsigned long *)vp->name,
( unsigned int) vp->name_length);
@@ -419,7 +417,6 @@ int wpdu::restore_vbs(Pdu& pdu, const snmp_pdu *raw_pdu) const
// extract the value portion
switch(vp->type) {
-
// octet string
case sNMP_SYNTAX_OCTETS:
case sNMP_SYNTAX_OPAQUE:
@@ -510,7 +507,6 @@ int wpdu::restore_vbs(Pdu& pdu, const snmp_pdu *raw_pdu) const
default:
tempvb.set_null();
-
} // end switch
// append the vb to the pdu
diff --git a/ACE/ASNMP/asnmp/wpdu.h b/ACE/ASNMP/asnmp/wpdu.h
index 454592e1f82..bfa35adebe0 100644
--- a/ACE/ASNMP/asnmp/wpdu.h
+++ b/ACE/ASNMP/asnmp/wpdu.h
@@ -37,7 +37,6 @@ struct snmp_pdu;
class ASNMP_Export wpdu
{
public:
-
/// construct CMU data from HP SNMP++ objects
/// construct HP SNMP++ objects from raw buffer via CMU SNMP datatypes
wpdu(const Pdu& pdu, const UdpTarget& target);
View Lorry Controller Status