===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/kdump/ktrstruct.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -c -r1.15 -r1.16
*** src/usr.bin/kdump/ktrstruct.c	2016/01/06 17:52:18	1.15
--- src/usr.bin/kdump/ktrstruct.c	2016/01/14 05:27:42	1.16
***************
*** 1,4 ****
! /*	$OpenBSD: ktrstruct.c,v 1.15 2016/01/06 17:52:18 tedu Exp $	*/
  
  /*-
   * Copyright (c) 1988, 1993
--- 1,4 ----
! /*	$OpenBSD: ktrstruct.c,v 1.16 2016/01/14 05:27:42 guenther Exp $	*/
  
  /*-
   * Copyright (c) 1988, 1993
***************
*** 370,378 ****
  ktrmsghdr(const struct msghdr *msg)
  {
  	printf("struct msghdr { name=%p, namelen=%u, iov=%p, iovlen=%u,"
! 	    " control=%p, controllen=%u, flags=%d }\n",
  	    msg->msg_name, msg->msg_namelen, msg->msg_iov, msg->msg_iovlen,
! 	    msg->msg_control, msg->msg_controllen, msg->msg_flags);
  }
  
  static void
--- 370,380 ----
  ktrmsghdr(const struct msghdr *msg)
  {
  	printf("struct msghdr { name=%p, namelen=%u, iov=%p, iovlen=%u,"
! 	    " control=%p, controllen=%u, flags=",
  	    msg->msg_name, msg->msg_namelen, msg->msg_iov, msg->msg_iovlen,
! 	    msg->msg_control, msg->msg_controllen);
! 	sendrecvflagsname(msg->msg_flags);
! 	printf(" }\n");
  }
  
  static void
***************
*** 402,449 ****
  	if (count > 1)
  		printf(" [%d]", count);
  	for (i = 0; i < count; i++) {
- 		char flags[100];
- 		const char *filter = "";
- 		const char *comma = "";
  		memcpy(&kev, data, sizeof(kev));
  		data += sizeof(kev);
! 		switch (kev.filter) {
! 		case EVFILT_READ:
! 			filter = "read";
! 			break;
! 		case EVFILT_WRITE:
! 			filter = "write";
! 			break;
! 		case EVFILT_VNODE:
! 			filter = "vnode";
! 			break;
! 		case EVFILT_PROC:
! 			filter = "proc";
! 			break;
! 		case EVFILT_SIGNAL:
! 			filter = "signal";
! 			break;
! 		case EVFILT_TIMER:
! 			filter = "timer";
! 			break;
  		}
! #define KEV_FLAG(value, name) \
! 	do if (kev.flags & value) { \
! 		strlcat(flags, comma, sizeof(flags)); \
! 		strlcat(flags, name, sizeof(flags)); \
! 		comma = ","; \
! 	} while (0)
! 
! 		KEV_FLAG(EV_ADD, "add");
! 		KEV_FLAG(EV_ENABLE, "enable");
! 		KEV_FLAG(EV_DISABLE, "disable");
! 		KEV_FLAG(EV_DELETE, "delete");
! 		KEV_FLAG(EV_ONESHOT, "oneshot");
! 		KEV_FLAG(EV_CLEAR, "clear");
! 		KEV_FLAG(EV_EOF, "EOF");
! 		KEV_FLAG(EV_ERROR, "error");
! 
! 		printf(" { filter=%s flags=%s ident=%lu }", filter, flags, kev.ident);
  	}
  	printf("\n");
  }
--- 404,422 ----
  	if (count > 1)
  		printf(" [%d]", count);
  	for (i = 0; i < count; i++) {
  		memcpy(&kev, data, sizeof(kev));
  		data += sizeof(kev);
! 		printf(" { ident=%lu, filter=", kev.ident);
! 		evfiltername(kev.filter);
! 		printf(", flags=");
! 		evflagsname(kev.flags);
! 		printf(", fflags=");
! 		evfflagsname(kev.filter, kev.fflags);
! 		printf(", data=%llu", kev.data);
! 		if ((kev.flags & EV_ERROR) && fancy) {
! 			printf("<\"%s\">", strerror(kev.data));
  		}
! 		printf(", udata=%p }", kev.udata);
  	}
  	printf("\n");
  }