Re: Recent copy of libpcap from CVS

Keith Owens
2008-09-11T00:10:12Z

David Miller (on Wed, 10 Sep 2008 16:59:31 -0700 (PDT)) wrote:
>From: Keith Owens <kaos@ocs.com.au>
>Date: Thu, 11 Sep 2008 09:57:08 +1000
>
>> Comparing git://git.kernel.org/pub/scm/linux/kernel/git/davem/libpcap.git
>> against Patrick's tarball. git is missing some mode and some rcsid
>> lines like this example below, I assume that the removal of these lines
>> in git was deliberate.
>
>Yes, look at the changesets in the tree, I did it.

Removing the #ifndef lines also accidentally removed a copyright notice.

diff -urp libpcap-0.9-PRE-CVS/filtertest.c libpcap/filtertest.c
--- libpcap-0.9-PRE-CVS/filtertest.c 2007-10-11 16:56:22.000000000 +1000
+++ libpcap/filtertest.c 2008-09-11 09:45:20.148341971 +1000
@@ -19,14 +19,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/

-#ifndef lint
-static const char copyright[] _U_ =
- "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\
-The Regents of the University of California. All rights reserved.\n";
-static const char rcsid[] _U_ =
- "@(#) $Header: /tcpdump/master/libpcap/filtertest.c,v 1.2 2005/08/08 17:50:13 guy Exp $ (LBL)";
-#endif
-
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif