From dan@obluda.cz  Sun Sep 12 02:37:44 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 AD9F916A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 12 Sep 2004 02:37:44 +0000 (GMT)
Received: from kulesh.obluda.cz (kulesh.obluda.cz [193.179.22.243])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8445C43D31
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 12 Sep 2004 02:37:43 +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 i8C2bfmk007099
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 12 Sep 2004 04:37:42 +0200 (CEST)
	(envelope-from dan@obluda.cz)
Received: (from root@localhost)
	by kulesh.obluda.cz (8.13.1/8.13.1/Submit) id i8C2bfRG007098
	for FreeBSD-gnats-submit@freebsd.org; Sun, 12 Sep 2004 04:37:41 +0200 (CEST)
	(envelope-from dan@obluda.cz)
Message-Id: <200409120237.i8C2bfRG007098@kulesh.obluda.cz>
Date: Sun, 12 Sep 2004 04:37:41 +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/tcpdump code
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         71619
>Category:       bin
>Synopsis:       [PATCH] cleanup of the usr.sbin/tcpdump code
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Sep 12 02:40:24 GMT 2004
>Closed-Date:    Mon Mar 05 13:02:58 GMT 2007
>Last-Modified:  Mon Mar 05 13:02:58 GMT 2007
>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
usr.sbin/tcpdump/tcpslice/tcpslice.c,v 1.12 2002/01/19 23:20:02 dillon
usr.sbin/tcpdump/tcpslice/gwtm2secs.c,v 1.4 1999/08/28 05:11:32 peter

>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/tcpdump/tcpslice/gwtm2secs.c:49: warning: suggest explicit braces to avoid ambiguous `else'
usr.sbin/tcpdump/tcpslice/tcpslice.c:198: warning: implicit declaration of function `_long_to_time'

>How-To-Repeat:
	N/A
>Fix:
*** usr.sbin/tcpdump/gwtm2secs.c.ORIG	Mon Sep  6 11:13:34 2004
--- usr.sbin/tcpdump/gwtm2secs.c	Mon Sep  6 11:14:33 2004
***************
*** 46,56 ****
  	 * 2-digit years are either 19xx or 20xx - a simple heuristic
  	 * distinguishes them, since we can't represent any time < 1970.
  	 */
! 	if ( year < 100 )
  		if ( year >= 70 )
  			year += 1900;
  		else
  			year += 2000;
  
  	days = 0;
  	for ( i = 1970; i < year; ++i )
--- 46,58 ----
  	 * 2-digit years are either 19xx or 20xx - a simple heuristic
  	 * distinguishes them, since we can't represent any time < 1970.
  	 */
! 	if ( year < 100 )
! 		{
  		if ( year >= 70 )
  			year += 1900;
  		else
  			year += 2000;
+ 		}
  
  	days = 0;
  	for ( i = 1970; i < year; ++i )
*** usr.sbin/tcpdump/tcpslice.c.ORIG	Sun Jan 20 00:20:02 2002
--- usr.sbin/tcpdump/tcpslice.c	Mon Sep  6 11:20:36 2004
***************
*** 35,40 ****
--- 35,41 ----
   */
  
  #include <err.h>
+ #include <timeconv.h>
  #include "tcpslice.h"
  
  int tflag = 0;	/* global that util routines are sensitive to */
>Release-Note:
>Audit-Trail:

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

 On 2004-09-12 04:37, Dan Lukes <dan@obluda.cz> wrote:
 > >Synopsis:       [PATCH] cleanup of the usr.sbin/tcpdump code
 
 tcpdump is third-party code.  The best way to have things fixed in tcpdump
 is to contact the vendors of the source and see if they have already fixed
 this in their source tree.  If not, your fixes could be incorporated to
 their source and the next import of tcpdump to our CVS tree will bring
 along your fixes too :-)
 
 - Giorgos
 

From: Dan Lukes <dan@obluda.cz>
To: Giorgos Keramidas <keramida@freebsd.org>
Cc: bug-followup@freebsd.org
Subject: Re: bin/71619: [PATCH] cleanup of the usr.sbin/tcpdump code
Date: Mon, 13 Sep 2004 06:04:54 +0200

 	My mistake. I know about the contributed sources, but mis the check in
 that case.
 
 	Close the PR

From: Giorgos Keramidas <keramida@freebsd.org>
To: Dan Lukes <dan@obluda.cz>
Cc: bug-followup@freebsd.org
Subject: Re: bin/71619: [PATCH] cleanup of the usr.sbin/tcpdump code
Date: Mon, 13 Sep 2004 08:21:40 +0300

 On 2004-09-13 06:04, Dan Lukes <dan@obluda.cz> wrote:
 > 	My mistake. I know about the contributed sources, but mis the check in
 > that case.
 >
 > 	Close the PR
 
 We can keep the PR open until you get a reply from the tcpdump authors.
 Then we can close it with:
 
 	"Dan sent this change to tcpdump.org, the authors of tcpdump
 	accepted it and the next release of tcpdump will include it."
 
 or whatever the conclusion of this happens to be.
 
 Thanks for your work on improving FreeBSD :-)
 
State-Changed-From-To: open->closed 
State-Changed-By: bms 
State-Changed-When: Mon Mar 5 13:02:46 UTC 2007 
State-Changed-Why:  
please resubmit to tcpdump.org 

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