svn commit: r235648 - stable/7/usr.sbin/mfiutil

[Bjoern A. Zeeb]

Author: bz
Date: Sat May 19 14:13:16 2012
New Revision: 235648
URL: http://svn.freebsd.org/changeset/base/235648

Log:
  MFC r222589:
  
    There are a couple of structs in mfireg.h with members named 'class'.
    These cause problems when trying to include the header in a C++ project.
    Rename them to 'evt_class', and track the change in mfi and mfiutil.
  
    Submitted by:	Mark Johnston
    Sponsored by:	Sandvine Incorporated
  
  Missed with:	r235636
  Submitted by:	Oliver Pinter (oliver.pntr gmail.com) to unbreak the build

Modified:
  stable/7/usr.sbin/mfiutil/mfi_evt.c
Directory Properties:
  stable/7/usr.sbin/mfiutil/   (props changed)

Modified: stable/7/usr.sbin/mfiutil/mfi_evt.c
==============================================================================
--- stable/7/usr.sbin/mfiutil/mfi_evt.c	Sat May 19 12:44:27 2012	(r235647)
+++ stable/7/usr.sbin/mfiutil/mfi_evt.c	Sat May 19 14:13:16 2012	(r235648)
@@ -363,8 +363,8 @@ mfi_decode_evt(int fd, struct mfi_evt_de
 {
 
 	printf("%5d (%s/%s/%s) - ", detail->seq, format_timestamp(detail->time),
-	    format_locale(detail->class.members.locale),
-	    format_class(detail->class.members.class));
+	    format_locale(detail->evt_class.members.locale),
+	    format_class(detail->evt_class.members.evt_class));
 	switch (detail->arg_type) {
 	case MR_EVT_ARGS_NONE:
 		break;
@@ -559,7 +559,7 @@ show_events(int ac, char **av)
 	num_events = 15;
 	filter.members.reserved = 0;
 	filter.members.locale = MFI_EVT_LOCALE_ALL;
-	filter.members.class = MFI_EVT_CLASS_WARNING;
+	filter.members.evt_class = MFI_EVT_CLASS_WARNING;
 	start = info.boot_seq_num;
 	stop = info.newest_seq_num;
 	verbose = 0;
@@ -569,7 +569,7 @@ show_events(int ac, char **av)
 	while ((ch = getopt(ac, av, "c:l:n:v")) != -1) {
 		switch (ch) {
 		case 'c':
-			if (parse_class(optarg, &filter.members.class) < 0) {
+			if (parse_class(optarg, &filter.members.evt_class) < 0) {
 				error = errno;
 				warn("Error parsing event class");
 				close(fd);