Author: rfm
Date: Wed Jun 17 21:30:26 2015
New Revision: 38655
URL: http://svn.gna.org/viewcvs/gnustep?rev=38655&view=rev
Log:
fix setting notification id
Modified:
libs/ec/trunk/ChangeLog
libs/ec/trunk/EcAlarmSinkSNMP.m
Modified: libs/ec/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/ec/trunk/ChangeLog?rev=38655&r1=38654&r2=38655&view=diff
==============================================================================
--- libs/ec/trunk/ChangeLog (original)
+++ libs/ec/trunk/ChangeLog Wed Jun 17 21:30:26 2015
@@ -1,3 +1,7 @@
+2015-06-17 Richard Frith-Macdonald <[email protected]>
+
+ * EcAlarmSinkSNMP.m: Fix stupid mistake setting notificationID.
+
2015-06-16 Richard Frith-Macdonald <[email protected]>
* EcAlarmSinkSNMP.m: Fix error in alarms table oid length.
Modified: libs/ec/trunk/EcAlarmSinkSNMP.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/ec/trunk/EcAlarmSinkSNMP.m?rev=38655&r1=38654&r2=38655&view=diff
==============================================================================
--- libs/ec/trunk/EcAlarmSinkSNMP.m (original)
+++ libs/ec/trunk/EcAlarmSinkSNMP.m Wed Jun 17 21:30:26 2015
@@ -1580,8 +1580,8 @@
struct alarmsTable_entry *entry;
entry = (struct alarmsTable_entry *)
-
netsnmp_tdata_remove_and_delete_row(alarmsTable,
- row);
+ netsnmp_tdata_remove_and_delete_row(
+ alarmsTable, row);
if (0 != entry)
{
SNMP_FREE(entry);
@@ -1617,12 +1617,12 @@
if (nil == prev)
{
- row = alarmsTable_createEntry
- ([next notificationID]);
/* Add and send the new alarm
*/
if (++notificationID <= 0) notificationID = 1;
[next setNotificationID: notificationID];
+ row = alarmsTable_createEntry(
+ [next notificationID]);
}
else
{
@@ -1631,7 +1631,8 @@
row = (netsnmp_tdata_row*)[prev extra];
/* send the clear for the entry.
*/
- [next setNotificationID: [prev
notificationID]];
+ [next setNotificationID:
+ [prev notificationID]];
[alarmSink _trap: prev forceClear: YES];
}
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
