Drop spurious changes

4 files changed, 15 insertions, 77 deletions

diff --git a/libbpf/Makefile~HEAD b/libbpf/Makefile~HEAD
deleted file mode 100644
index 8b02a2a30..000000000
--- a/libbpf/Makefile~HEAD
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-#   Copyright (C) 1994,95,96,97,98,99,2000,01,02,2005 Free Software Foundation, Inc.
-#
-#   This program is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation; either version 2, or (at
-#   your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-dir := libbpf
-makemode := library
-
-libname = libbpf
-SRCS= bpf_impl.c queue.c
-LCLHDRS = bpf_impl.h queue.h
-installhdrs = bpf_impl.h queue.h
-
-MIGSTUBS = 
-OBJS = $(sort $(SRCS:.c=.o) $(MIGSTUBS))
-
-MIGCOMSFLAGS =
-
-include ../Makeconf
diff --git a/libbpf/Makefile~HEAD_0 b/libbpf/Makefile~HEAD_0
deleted file mode 100644
index 8b02a2a30..000000000
--- a/libbpf/Makefile~HEAD_0
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-#   Copyright (C) 1994,95,96,97,98,99,2000,01,02,2005 Free Software Foundation, Inc.
-#
-#   This program is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation; either version 2, or (at
-#   your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-dir := libbpf
-makemode := library
-
-libname = libbpf
-SRCS= bpf_impl.c queue.c
-LCLHDRS = bpf_impl.h queue.h
-installhdrs = bpf_impl.h queue.h
-
-MIGSTUBS = 
-OBJS = $(sort $(SRCS:.c=.o) $(MIGSTUBS))
-
-MIGCOMSFLAGS =
-
-include ../Makeconf
diff --git a/libbpf/bpf_impl.h b/libbpf/bpf_impl.h
index 9073fdaca..2b092b7e5 100644
--- a/libbpf/bpf_impl.h
+++ b/libbpf/bpf_impl.h
@@ -1,25 +1,25 @@
- /* 
+ /*
   * Mach Operating System
   * Copyright (c) 1993-1989 Carnegie Mellon University
   * All Rights Reserved.
-  * 
+  *
   * Permission to use, copy, modify and distribute this software and its
   * documentation is hereby granted, provided that both the copyright
   * notice and this permission notice appear in all copies of the
   * software, derivative works or modified versions, and any portions
   * thereof, and that both notices appear in supporting documentation.
-  * 
+  *
   * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
   * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
   * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-  * 
+  *
   * Carnegie Mellon requests users of this software to return to
-  * 
+  *
   *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
   *  School of Computer Science
   *  Carnegie Mellon University
   *  Pittsburgh PA 15213-3890
-  * 
+  *
   * any improvements or extensions that they make and grant Carnegie Mellon
   * the rights to redistribute these changes.
   */
@@ -29,8 +29,8 @@
  *
  *	Network IO.
  *
- *	Packet filter code taken from vaxif/enet.c written		 
- *		CMU and Stanford. 
+ *	Packet filter code taken from vaxif/enet.c written
+ *		CMU and Stanford.
  */
 
 /* the code copied from device/net_io.c in Mach */
@@ -125,7 +125,7 @@ typedef struct net_hash_entry *net_hash_entry_t;
  * This structure represents a packet filter with multiple sessions.
  *
  * For example, all application level TCP sessions might be
- * represented by one of these structures.  It looks like a 
+ * represented by one of these structures.  It looks like a
  * net_rcv_port struct so that both types can live on the
  * same packet filter queues.
  */
@@ -138,7 +138,7 @@ struct net_hash_header {
 
 typedef struct net_hash_header *net_hash_header_t;
 
-int bpf_do_filter(net_rcv_port_t infp, char *p,	unsigned int wirelen, 
+int bpf_do_filter(net_rcv_port_t infp, char *p,	unsigned int wirelen,
 		char *header, unsigned int hlen, net_hash_entry_t **hash_headpp,
 		net_hash_entry_t *entpp);
 io_return_t net_set_filter(if_filter_list_t *ifp, mach_port_t rcv_port,
@@ -154,7 +154,7 @@ int hash_ent_remove (if_filter_list_t *ifp, net_hash_header_t hp, int used,
 		net_hash_entry_t *head, net_hash_entry_t entp, queue_entry_t *dead_p);
 void net_free_dead_infp (queue_entry_t dead_infp);
 void net_free_dead_entp (queue_entry_t dead_entp);
-void remove_dead_filter (if_filter_list_t *ifp, 
+void remove_dead_filter (if_filter_list_t *ifp,
 		queue_head_t *if_port_list, mach_port_t dead_port);
 void destroy_filters (if_filter_list_t *ifp);
 
diff --git a/libbpf/util.h b/libbpf/util.h
index c90b0f857..b062638db 100644
--- a/libbpf/util.h
+++ b/libbpf/util.h
@@ -1,4 +1,4 @@
-/* 
+/*
    Copyright (C) 2008 Free Software Foundation, Inc.
    Written by Zheng Da.
 
@@ -58,7 +58,7 @@
 
 #define ETH_ALEN 6		/* Octets in one ethernet addr	 */
 
-struct ethhdr 
+struct ethhdr
 {
   unsigned char	h_dest[ETH_ALEN];	/* destination eth addr	*/
   unsigned char	h_source[ETH_ALEN];	/* source ether addr	*/
@@ -75,13 +75,13 @@ print_pack (char *packet, int len)
   char src_str[INET_ADDRSTRLEN];
   char dst_str[INET_ADDRSTRLEN];
   if (ntohs (ethh->h_proto) == ETH_P_IP
-      && len >= sizeof (struct ethhdr) + sizeof (struct iphdr)) 
+      && len >= sizeof (struct ethhdr) + sizeof (struct iphdr))
     {
       debug ("multiplexer: get a IP packet from %s to %s\n",
 	     inet_ntop (AF_INET, &iph->saddr, src_str, INET_ADDRSTRLEN),
 	     inet_ntop (AF_INET, &iph->daddr, dst_str, INET_ADDRSTRLEN));
     }
-  else 
+  else
     {
       debug ("multiplexer: get a non-IP packet\n");
     }