mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-10-20 02:38:43 +00:00
Code Issues Releases Activity

- Fix an off by one error when checking for the stop event. This resulted

Browse Source 
in not showing the most recent event by default.
- When the stop even is hit, break out of the outer loop to stop fetching
  more events.

MFC after:	1 week
This commit is contained in:
John Baldwin 2014-04-22 15:17:32 +00:00
parent 4099f0ec42
commit 186ddf9631
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=264766
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
usr.sbin/mfiutil/mfi_evt.c
View File

@ -33,6 +33,7 @@
#include <sys/errno.h>
#include <err.h>
#include <fcntl.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <strings.h>
@ -534,6 +535,7 @@ show_events(int ac, char **av)
struct mfi_evt_log_state info;
struct mfi_evt_list *list;
union mfi_evt filter;
bool first;
long val;
char *cp;
ssize_t size;
@ -640,7 +642,9 @@ show_events(int ac, char **av)
close(fd);
return (ENOMEM);
}
for (seq = start;;) {
first = true;
seq = start;
for (;;) {
if (mfi_get_events(fd, list, num_events, filter, seq,
&status) < 0) {
error = errno;
@ -650,8 +654,6 @@ show_events(int ac, char **av)
return (error);
}
if (status == MFI_STAT_NOT_FOUND) {
if (seq == start)
warnx("No matching events found");
break;
}
if (status != MFI_STAT_OK) {
@ -669,13 +671,14 @@ show_events(int ac, char **av)
* the case that our stop point is earlier in
* the buffer than our start point.
*/
if (list->event[i].seq >= stop) {
if (list->event[i].seq > stop) {
if (start <= stop)
break;
goto finish;
else if (list->event[i].seq < start)
break;
goto finish;
}
mfi_decode_evt(fd, &list->event[i], verbose);
first = false;
}
/*
@ -686,6 +689,9 @@ show_events(int ac, char **av)
seq = list->event[list->count - 1].seq + 1;
}
finish:
if (first)
warnx("No matching events found");
free(list);
close(fd);