From dan@obluda.cz  Sun Sep 12 02:37:29 2004
Return-Path: <dan@obluda.cz>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8F05216A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 12 Sep 2004 02:37:29 +0000 (GMT)
Received: from kulesh.obluda.cz (kulesh.obluda.cz [193.179.22.243])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5DA0C43D31
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 12 Sep 2004 02:37:28 +0000 (GMT)
	(envelope-from dan@obluda.cz)
Received: from kulesh.obluda.cz (localhost.eunet.cz [127.0.0.1])
	by kulesh.obluda.cz (8.13.1/8.13.1) with ESMTP id i8C2bQqQ007091
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 12 Sep 2004 04:37:27 +0200 (CEST)
	(envelope-from dan@obluda.cz)
Received: (from root@localhost)
	by kulesh.obluda.cz (8.13.1/8.13.1/Submit) id i8C2bQis007090
	for FreeBSD-gnats-submit@freebsd.org; Sun, 12 Sep 2004 04:37:26 +0200 (CEST)
	(envelope-from dan@obluda.cz)
Message-Id: <200409120237.i8C2bQis007090@kulesh.obluda.cz>
Date: Sun, 12 Sep 2004 04:37:26 +0200 (CEST)
From: Dan Lukes <dan@obluda.cz>
Reply-To: Dan Lukes <dan@obluda.cz>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] cleanup of the usr.sbin/usbd code
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         71615
>Category:       bin
>Synopsis:       [usb] [patch] cleanup of the usr.sbin/usbd code
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-usb
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Sep 12 02:40:22 GMT 2004
>Closed-Date:    Sun Nov 28 20:37:25 GMT 2004
>Last-Modified:  Sun Nov 28 20:37:25 GMT 2004
>Originator:     Dan Lukes
>Release:        FreeBSD 5.3-BETA3 i386
>Organization:
Obludarium
>Environment:
System: FreeBSD kulesh.obluda.cz 5.3-BETA3 FreeBSD 5.3-BETA3 #8: Sun Sep 5 07:06:40 CEST 2004 dan@kulesh.obluda.cz:/usr/obj/usr/src/sys/Dan i386
$FreeBSD: src/usr.sbin/usbd/usbd.c,v 1.29 2003/10/25 22:03:10 jmg

>Description:
	There are more than 5000 warnings issued during "make buildworld".
Some of them are false positives, but some of them are sign of true errors.

	Nobody is upset by warnings due it's amount, so some errors remain
uncorrected.

	I want to cleanup the code-base from warnings, so warnings will
become "attention mark" again.

usr.sbin/usbd/usbd.c:588: warning: long int format, time_t arg (arg 2)
usr.sbin/usbd/usbd.c:610: warning: int format, pointer arg (arg 2)
usr.sbin/usbd/usbd.c:615: warning: unsigned int format, pointer arg (arg 2)
usr.sbin/usbd/usbd.c:615: warning: char format, different type arg (arg 3)

>How-To-Repeat:
	N/A
>Fix:
*** usr.sbin/usbd/usbd.c.ORIG	Sun Sep  5 18:40:34 2004
--- usr.sbin/usbd/usbd.c	Sun Sep  5 18:51:23 2004
***************
*** 584,590 ****
  		devinfo = &event->u.ue_device;
  
  		printf(" at %ld.%09ld, %s, %s:\n",
! 			timespec->tv_sec, timespec->tv_nsec,
  			devinfo->udi_product, devinfo->udi_vendor);
  
  		printf("  vndr=0x%04x prdct=0x%04x rlse=0x%04x "
--- 584,590 ----
  		devinfo = &event->u.ue_device;
  
  		printf(" at %ld.%09ld, %s, %s:\n",
! 			(long int)timespec->tv_sec, timespec->tv_nsec,
  			devinfo->udi_product, devinfo->udi_vendor);
  
  		printf("  vndr=0x%04x prdct=0x%04x rlse=0x%04x "
***************
*** 607,618 ****
  		}
  	} else if (event->ue_type == USB_EVENT_CTRLR_ATTACH ||
  	    event->ue_type == USB_EVENT_CTRLR_DETACH) {
! 		printf(" bus=%d", &event->u.ue_ctrlr.ue_bus);
  	} else if (event->ue_type == USB_EVENT_DRIVER_ATTACH ||
  	    event->ue_type == USB_EVENT_DRIVER_DETACH) {
  		printf(" cookie=%u devname=%s",
! 		    &event->u.ue_driver.ue_cookie.cookie,
! 		    &event->u.ue_driver.ue_devname);
  	}
  	printf("\n");
  }
--- 607,618 ----
  		}
  	} else if (event->ue_type == USB_EVENT_CTRLR_ATTACH ||
  	    event->ue_type == USB_EVENT_CTRLR_DETACH) {
! 		printf(" bus=%d", event->u.ue_ctrlr.ue_bus);
  	} else if (event->ue_type == USB_EVENT_DRIVER_ATTACH ||
  	    event->ue_type == USB_EVENT_DRIVER_DETACH) {
  		printf(" cookie=%u devname=%s",
! 		    event->u.ue_driver.ue_cookie.cookie,
! 		    event->u.ue_driver.ue_devname);
  	}
  	printf("\n");
  }
>Release-Note:
>Audit-Trail:

From: Giorgos Keramidas <keramida@freebsd.org>
To: Dan Lukes <dan@obluda.cz>
Cc: bug-followup@freebsd.org
Subject: Re: bin/71615: [PATCH] cleanup of the usr.sbin/usbd code
Date: Sun, 12 Sep 2004 21:49:31 +0300

 On 2004-09-12 04:37, Dan Lukes <dan@obluda.cz> wrote:
 >   		printf(" at %ld.%09ld, %s, %s:\n",
 > - 			timespec->tv_sec, timespec->tv_nsec,
 > + 			(long int)timespec->tv_sec, timespec->tv_nsec,
 >   			devinfo->udi_product, devinfo->udi_vendor);
 
 This should probably use a cast to unsigned long or intmax_t.
Responsible-Changed-From-To: freebsd-bugs->freebsd-usb 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Thu Nov 4 07:36:25 GMT 2004 
Responsible-Changed-Why:  
Reassign to appropriate mailing list. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=71615 

From: Craig Rodrigues <rodrigc@crodrigues.org>
To: freebsd-gnats-submit@FreeBSD.org
Cc: dan@obluda.cz
Subject: Re: bin/71615: [usb] [patch] cleanup of the usr.sbin/usbd code
Date: Fri, 5 Nov 2004 12:49:55 -0500

 Hi,
 
 This patch works with intmax_t, so should make
 64-bit and 32-bit platforms happy. :)
 
 
 
 
 --- usbd.c.orig	Fri Nov  5 12:12:00 2004
 +++ usbd.c	Fri Nov  5 12:44:59 2004
 @@ -54,6 +54,7 @@
  #include <ctype.h>
  #include <signal.h>
  #include <paths.h>
 +#include <stdint.h>
  #include <sys/param.h>
  #include <sys/types.h>
  #include <sys/errno.h>
 @@ -583,8 +584,8 @@
  	    event->ue_type == USB_EVENT_DEVICE_DETACH) {
  		devinfo = &event->u.ue_device;
  
 -		printf(" at %ld.%09ld, %s, %s:\n",
 -			timespec->tv_sec, timespec->tv_nsec,
 +		printf(" at %jd.%09ld, %s, %s:\n",
 +			(intmax_t)timespec->tv_sec, timespec->tv_nsec,
  			devinfo->udi_product, devinfo->udi_vendor);
  
  		printf("  vndr=0x%04x prdct=0x%04x rlse=0x%04x "
 @@ -607,12 +608,12 @@
  		}
  	} else if (event->ue_type == USB_EVENT_CTRLR_ATTACH ||
  	    event->ue_type == USB_EVENT_CTRLR_DETACH) {
 -		printf(" bus=%d", &event->u.ue_ctrlr.ue_bus);
 +		printf(" bus=%d", event->u.ue_ctrlr.ue_bus);
  	} else if (event->ue_type == USB_EVENT_DRIVER_ATTACH ||
  	    event->ue_type == USB_EVENT_DRIVER_DETACH) {
  		printf(" cookie=%u devname=%s",
 -		    &event->u.ue_driver.ue_cookie.cookie,
 -		    &event->u.ue_driver.ue_devname);
 +		    event->u.ue_driver.ue_cookie.cookie,
 +		    event->u.ue_driver.ue_devname);
  	}
  	printf("\n");
  }
 
 
 
 
 
 -- 
 Craig Rodrigues        
 http://crodrigues.org
 rodrigc@crodrigues.org
State-Changed-From-To: open->closed 
State-Changed-By: iedowse 
State-Changed-When: Sun Nov 28 20:36:34 GMT 2004 
State-Changed-Why:  

Patch committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=71615 
>Unformatted:
