summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2011-09-09 11:18:46 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2011-09-09 11:18:46 +0000
commit2290f6114311002738dc28ff687650397766197c (patch)
tree943d82176e9e205928d27b33f01103bd925c9fcd
parentea4336fd90e5f3ac82021859dcea61ceddb06de8 (diff)
downloadATCD-2290f6114311002738dc28ff687650397766197c.tar.gz
Fri Sep 9 09:39:47 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* README: * asnmp/transaction.h: * asnmp/wpdu.cpp: Layout/doxygen changes
-rw-r--r--ACE/ASNMP/ChangeLog7
-rw-r--r--ACE/ASNMP/README2
-rw-r--r--ACE/ASNMP/asnmp/transaction.h2
-rw-r--r--ACE/ASNMP/asnmp/wpdu.cpp4
4 files changed, 10 insertions, 5 deletions
diff --git a/ACE/ASNMP/ChangeLog b/ACE/ASNMP/ChangeLog
index 743576601fc..dc7d1030a9c 100644
--- a/ACE/ASNMP/ChangeLog
+++ b/ACE/ASNMP/ChangeLog
@@ -1,3 +1,10 @@
+Fri Sep 9 09:39:47 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * README:
+ * asnmp/transaction.h:
+ * asnmp/wpdu.cpp:
+ Layout/doxygen changes
+
Wed Sep 7 09:13:29 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* README:
diff --git a/ACE/ASNMP/README b/ACE/ASNMP/README
index b552a7aaedb..83885971956 100644
--- a/ACE/ASNMP/README
+++ b/ACE/ASNMP/README
@@ -41,7 +41,7 @@ How does ASNMP differ from SNMP?
ASNMP has less global namespace pollution by moving all non-class
functions into interface classes or made into static locals.
- An agent inteface has been added (asnmp/sagent.h) so both agents
+ An agent intefarce has been added (asnmp/sagent.h) so both agents
and managers can use this class library. A trivial agent
exists in ASNMP/agent/
diff --git a/ACE/ASNMP/asnmp/transaction.h b/ACE/ASNMP/asnmp/transaction.h
index e52ee95e6a7..db744bd7f7b 100644
--- a/ACE/ASNMP/asnmp/transaction.h
+++ b/ACE/ASNMP/asnmp/transaction.h
@@ -29,7 +29,7 @@
/**
* @class transaction
*
- * @brief Used to manage the details of a particular transaction betwen
+ * @brief Used to manage the details of a particular transaction between
* two SNMP agents. Uses SnmpTarget class to implement retry/timeout
*/
class ASNMP_Export transaction : public ACE_Event_Handler
diff --git a/ACE/ASNMP/asnmp/wpdu.cpp b/ACE/ASNMP/asnmp/wpdu.cpp
index 454e8ced7a8..1b1571bb478 100644
--- a/ACE/ASNMP/asnmp/wpdu.cpp
+++ b/ACE/ASNMP/asnmp/wpdu.cpp
@@ -124,7 +124,6 @@ int wpdu::set_trap_info(snmp_pdu *raw_pdu, const Pdu& pdu) const
return SNMP_CLASS_INVALID_NOTIFYID;
}
-
raw_pdu->specific_type=0;
// TODO: object should emit numeric instead of this kind of mess...
@@ -380,8 +379,7 @@ int wpdu::get_pdu(Pdu& pdu, snmp_version& version)
if (iovec_.iov_len == 0)
return -1; // NO DATA
- snmp_pdu *raw_pdu;
- raw_pdu = cmu_snmp::pdu_create(0);
+ snmp_pdu *raw_pdu = cmu_snmp::pdu_create(0);
if (!raw_pdu) {
return SNMP_CLASS_RESOURCE_UNAVAIL;
}