===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/hexdump/display.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -c -r1.24 -r1.25
*** src/usr.bin/hexdump/display.c	2016/03/15 04:19:13	1.24
--- src/usr.bin/hexdump/display.c	2016/08/24 03:13:45	1.25
***************
*** 1,4 ****
! /*	$OpenBSD: display.c,v 1.24 2016/03/15 04:19:13 mmcc Exp $	*/
  /*	$NetBSD: display.c,v 1.12 2001/12/07 15:14:29 bjh21 Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: display.c,v 1.25 2016/08/24 03:13:45 guenther Exp $	*/
  /*	$NetBSD: display.c,v 1.12 2001/12/07 15:14:29 bjh21 Exp $	*/
  
  /*
***************
*** 100,106 ****
  		for (pr = endfu->nextpr; pr; pr = pr->nextpr)
  			switch(pr->flags) {
  			case F_ADDRESS:
! 				(void)printf(pr->fmt, (quad_t)eaddress);
  				break;
  			case F_TEXT:
  				(void)printf("%s", pr->fmt);
--- 100,106 ----
  		for (pr = endfu->nextpr; pr; pr = pr->nextpr)
  			switch(pr->flags) {
  			case F_ADDRESS:
! 				(void)printf(pr->fmt, (int64_t)eaddress);
  				break;
  			case F_TEXT:
  				(void)printf("%s", pr->fmt);
***************
*** 123,129 ****
  
  	switch(pr->flags) {
  	case F_ADDRESS:
! 		(void)printf(pr->fmt, (quad_t)address);
  		break;
  	case F_BPAD:
  		(void)printf(pr->fmt, "");
--- 123,129 ----
  
  	switch(pr->flags) {
  	case F_ADDRESS:
! 		(void)printf(pr->fmt, (int64_t)address);
  		break;
  	case F_BPAD:
  		(void)printf(pr->fmt, "");
***************
*** 149,163 ****
  	case F_INT:
  		switch(pr->bcnt) {
  		case 1:
! 			(void)printf(pr->fmt, (quad_t)*bp);
  			break;
  		case 2:
  			memmove(&s2, bp, sizeof(s2));
! 			(void)printf(pr->fmt, (quad_t)s2);
  			break;
  		case 4:
  			memmove(&s4, bp, sizeof(s4));
! 			(void)printf(pr->fmt, (quad_t)s4);
  			break;
  		case 8:
  			memmove(&s8, bp, sizeof(s8));
--- 149,163 ----
  	case F_INT:
  		switch(pr->bcnt) {
  		case 1:
! 			(void)printf(pr->fmt, (int64_t)*bp);
  			break;
  		case 2:
  			memmove(&s2, bp, sizeof(s2));
! 			(void)printf(pr->fmt, (int64_t)s2);
  			break;
  		case 4:
  			memmove(&s4, bp, sizeof(s4));
! 			(void)printf(pr->fmt, (int64_t)s4);
  			break;
  		case 8:
  			memmove(&s8, bp, sizeof(s8));
***************
*** 180,194 ****
  	case F_UINT:
  		switch(pr->bcnt) {
  		case 1:
! 			(void)printf(pr->fmt, (u_quad_t)*bp);
  			break;
  		case 2:
  			memmove(&u2, bp, sizeof(u2));
! 			(void)printf(pr->fmt, (u_quad_t)u2);
  			break;
  		case 4:
  			memmove(&u4, bp, sizeof(u4));
! 			(void)printf(pr->fmt, (u_quad_t)u4);
  			break;
  		case 8:
  			memmove(&u8, bp, sizeof(u8));
--- 180,194 ----
  	case F_UINT:
  		switch(pr->bcnt) {
  		case 1:
! 			(void)printf(pr->fmt, (uint64_t)*bp);
  			break;
  		case 2:
  			memmove(&u2, bp, sizeof(u2));
! 			(void)printf(pr->fmt, (uint64_t)u2);
  			break;
  		case 4:
  			memmove(&u4, bp, sizeof(u4));
! 			(void)printf(pr->fmt, (uint64_t)u4);
  			break;
  		case 8:
  			memmove(&u8, bp, sizeof(u8));