From f6a3c30d3c1e493f2cf1f0f68daf470a8fa3ad8e Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 29 Oct 2005 20:26:13 +0000 Subject: [PATCH] hcidump: Big cleanup of CVS relics --- tools/hcidump.c | 6 ++---- tools/parser/avdtp.c | 14 ++++++++------ tools/parser/bnep.c | 12 +++++++----- tools/parser/bpa.c | 14 ++++++++------ tools/parser/capi.c | 12 +++++++----- tools/parser/cmtp.c | 12 +++++++----- tools/parser/csr.c | 14 ++++++++------ tools/parser/hci.c | 12 +++++++----- tools/parser/hcrp.c | 14 ++++++++------ tools/parser/hidp.c | 14 ++++++++------ tools/parser/l2cap.c | 12 +++++++----- tools/parser/lmp.c | 10 ++++++---- tools/parser/obex.c | 14 ++++++++------ tools/parser/parser.c | 14 ++++++++------ tools/parser/parser.h | 6 ++---- tools/parser/rfcomm.c | 12 +++++++----- tools/parser/rfcomm.h | 6 ++---- tools/parser/sdp.c | 12 +++++++----- tools/parser/sdp.h | 6 ++---- 19 files changed, 119 insertions(+), 97 deletions(-) diff --git a/tools/hcidump.c b/tools/hcidump.c index bd2e0730e..f6b1f403b 100644 --- a/tools/hcidump.c +++ b/tools/hcidump.c @@ -1,6 +1,6 @@ /* * - * Bluetooth packet analyzer - HCI sniffer + * BlueZ - Bluetooth protocol stack for Linux * * Copyright (C) 2000-2002 Maxim Krasnyansky * Copyright (C) 2003-2005 Marcel Holtmann @@ -18,10 +18,8 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * - * - * $Id$ */ #ifdef HAVE_CONFIG_H diff --git a/tools/parser/avdtp.c b/tools/parser/avdtp.c index aa1003b21..c7ee95391 100644 --- a/tools/parser/avdtp.c +++ b/tools/parser/avdtp.c @@ -1,6 +1,6 @@ /* * - * Bluetooth packet analyzer - AVDTP parser + * BlueZ - Bluetooth protocol stack for Linux * * Copyright (C) 2004-2005 Marcel Holtmann * @@ -17,16 +17,18 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * - * - * $Id$ */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include -#include -#include #include +#include +#include #include #include diff --git a/tools/parser/bnep.c b/tools/parser/bnep.c index de0af7a18..ea854986e 100644 --- a/tools/parser/bnep.c +++ b/tools/parser/bnep.c @@ -1,6 +1,6 @@ /* * - * Bluetooth packet analyzer - BNEP parser + * BlueZ - Bluetooth protocol stack for Linux * * Copyright (C) 2002-2003 Takashi Sasai * Copyright (C) 2003-2005 Marcel Holtmann @@ -18,16 +18,18 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * - * - * $Id$ */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include -#include #include +#include #include #include diff --git a/tools/parser/bpa.c b/tools/parser/bpa.c index f58f40935..a5eb30706 100644 --- a/tools/parser/bpa.c +++ b/tools/parser/bpa.c @@ -1,6 +1,6 @@ /* * - * Bluetooth packet analyzer - BPA parser + * BlueZ - Bluetooth protocol stack for Linux * * Copyright (C) 2004-2005 Marcel Holtmann * @@ -17,16 +17,18 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * - * - * $Id$ */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include -#include -#include #include +#include +#include #include #include diff --git a/tools/parser/capi.c b/tools/parser/capi.c index 1e26365cb..3c67a9437 100644 --- a/tools/parser/capi.c +++ b/tools/parser/capi.c @@ -1,6 +1,6 @@ /* * - * Bluetooth packet analyzer - CAPI parser + * BlueZ - Bluetooth protocol stack for Linux * * Copyright (C) 2004-2005 Marcel Holtmann * @@ -17,17 +17,19 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * - * - * $Id$ */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include #include -#include #include +#include #include #include diff --git a/tools/parser/cmtp.c b/tools/parser/cmtp.c index 6af45bf19..798c672b4 100644 --- a/tools/parser/cmtp.c +++ b/tools/parser/cmtp.c @@ -1,6 +1,6 @@ /* * - * Bluetooth packet analyzer - CMTP parser + * BlueZ - Bluetooth protocol stack for Linux * * Copyright (C) 2002-2005 Marcel Holtmann * @@ -17,16 +17,18 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * - * - * $Id$ */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include -#include #include +#include #include #include diff --git a/tools/parser/csr.c b/tools/parser/csr.c index d99f37ebe..a9392d559 100644 --- a/tools/parser/csr.c +++ b/tools/parser/csr.c @@ -1,6 +1,6 @@ /* * - * Bluetooth packet analyzer - CSR parser + * BlueZ - Bluetooth protocol stack for Linux * * Copyright (C) 2004-2005 Marcel Holtmann * @@ -17,16 +17,18 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * - * - * $Id$ */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include -#include -#include #include +#include +#include #include #include diff --git a/tools/parser/hci.c b/tools/parser/hci.c index a65193057..ae48f77ea 100644 --- a/tools/parser/hci.c +++ b/tools/parser/hci.c @@ -1,6 +1,6 @@ /* * - * Bluetooth packet analyzer - HCI parser + * BlueZ - Bluetooth protocol stack for Linux * * Copyright (C) 2000-2002 Maxim Krasnyansky * Copyright (C) 2003-2005 Marcel Holtmann @@ -18,17 +18,19 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * - * - * $Id$ */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include #include -#include #include +#include #include #include diff --git a/tools/parser/hcrp.c b/tools/parser/hcrp.c index 8f50c229f..f127b5dcb 100644 --- a/tools/parser/hcrp.c +++ b/tools/parser/hcrp.c @@ -1,6 +1,6 @@ /* * - * Bluetooth packet analyzer - HCRP parser + * BlueZ - Bluetooth protocol stack for Linux * * Copyright (C) 2004-2005 Marcel Holtmann * @@ -17,16 +17,18 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * - * - * $Id$ */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include -#include -#include #include +#include +#include #include #include diff --git a/tools/parser/hidp.c b/tools/parser/hidp.c index 919665a06..22187a554 100644 --- a/tools/parser/hidp.c +++ b/tools/parser/hidp.c @@ -1,6 +1,6 @@ /* * - * Bluetooth packet analyzer - HIDP parser + * BlueZ - Bluetooth protocol stack for Linux * * Copyright (C) 2003-2005 Marcel Holtmann * @@ -17,16 +17,18 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * - * - * $Id$ */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include -#include -#include #include +#include +#include #include #include diff --git a/tools/parser/l2cap.c b/tools/parser/l2cap.c index 38adc593a..b7425cfbf 100644 --- a/tools/parser/l2cap.c +++ b/tools/parser/l2cap.c @@ -1,6 +1,6 @@ /* * - * Bluetooth packet analyzer - L2CAP parser + * BlueZ - Bluetooth protocol stack for Linux * * Copyright (C) 2000-2002 Maxim Krasnyansky * Copyright (C) 2003-2005 Marcel Holtmann @@ -18,16 +18,18 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * - * - * $Id$ */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include -#include #include +#include #include #include diff --git a/tools/parser/lmp.c b/tools/parser/lmp.c index 514d28285..96cd961b6 100644 --- a/tools/parser/lmp.c +++ b/tools/parser/lmp.c @@ -1,6 +1,6 @@ /* * - * Bluetooth packet analyzer - LMP parser + * BlueZ - Bluetooth protocol stack for Linux * * Copyright (C) 2004-2005 Marcel Holtmann * @@ -17,12 +17,14 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * - * - * $Id$ */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include #include diff --git a/tools/parser/obex.c b/tools/parser/obex.c index 2e5ee4333..758cea22c 100644 --- a/tools/parser/obex.c +++ b/tools/parser/obex.c @@ -1,6 +1,6 @@ /* * - * Bluetooth packet analyzer - OBEX parser + * BlueZ - Bluetooth protocol stack for Linux * * Copyright (C) 2004-2005 Marcel Holtmann * @@ -17,16 +17,18 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * - * - * $Id$ */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include -#include -#include #include +#include +#include #include #include diff --git a/tools/parser/parser.c b/tools/parser/parser.c index 34ae4e584..fae13b5ee 100644 --- a/tools/parser/parser.c +++ b/tools/parser/parser.c @@ -1,6 +1,6 @@ /* * - * Bluetooth packet analyzer - Common parser functions + * BlueZ - Bluetooth protocol stack for Linux * * Copyright (C) 2000-2002 Maxim Krasnyansky * Copyright (C) 2003-2005 Marcel Holtmann @@ -18,18 +18,20 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * - * - * $Id$ */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include -#include +#include #include +#include #include -#include #include #include diff --git a/tools/parser/parser.h b/tools/parser/parser.h index ffcc454df..42ed05bb7 100644 --- a/tools/parser/parser.h +++ b/tools/parser/parser.h @@ -1,6 +1,6 @@ /* * - * Bluetooth packet analyzer - Common parser functions + * BlueZ - Bluetooth protocol stack for Linux * * Copyright (C) 2000-2002 Maxim Krasnyansky * Copyright (C) 2003-2005 Marcel Holtmann @@ -18,10 +18,8 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * - * - * $Id$ */ #ifndef __PARSER_H diff --git a/tools/parser/rfcomm.c b/tools/parser/rfcomm.c index 5191f70ed..6a1a5e58f 100644 --- a/tools/parser/rfcomm.c +++ b/tools/parser/rfcomm.c @@ -1,6 +1,6 @@ /* * - * Bluetooth packet analyzer - RFCOMM parser + * BlueZ - Bluetooth protocol stack for Linux * * Copyright (C) 2001-2002 Wayne Lee * Copyright (C) 2003-2005 Marcel Holtmann @@ -18,16 +18,18 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * - * - * $Id$ */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include -#include #include +#include #include #include diff --git a/tools/parser/rfcomm.h b/tools/parser/rfcomm.h index 45a0dc535..d64b78657 100644 --- a/tools/parser/rfcomm.h +++ b/tools/parser/rfcomm.h @@ -1,6 +1,6 @@ /* * - * Bluetooth packet analyzer - RFCOMM parser + * BlueZ - Bluetooth protocol stack for Linux * * Copyright (C) 2001-2002 Wayne Lee * Copyright (C) 2003-2005 Marcel Holtmann @@ -18,10 +18,8 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * - * - * $Id$ */ #ifndef __RFCOMM_H diff --git a/tools/parser/sdp.c b/tools/parser/sdp.c index e5a750ab9..817d1217b 100644 --- a/tools/parser/sdp.c +++ b/tools/parser/sdp.c @@ -1,6 +1,6 @@ /* * - * Bluetooth packet analyzer - SDP parser + * BlueZ - Bluetooth protocol stack for Linux * * Copyright (C) 2001-2002 Ricky Yuen * Copyright (C) 2003-2005 Marcel Holtmann @@ -18,16 +18,18 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * - * - * $Id$ */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include -#include #include +#include #include #include diff --git a/tools/parser/sdp.h b/tools/parser/sdp.h index e996d8399..ea605c1dd 100644 --- a/tools/parser/sdp.h +++ b/tools/parser/sdp.h @@ -1,6 +1,6 @@ /* * - * Bluetooth packet analyzer - SDP parser + * BlueZ - Bluetooth protocol stack for Linux * * Copyright (C) 2001-2002 Ricky Yuen * Copyright (C) 2003-2005 Marcel Holtmann @@ -18,10 +18,8 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * - * - * $Id$ */ #ifndef __SDP_H -- 2.47.3