From 6c65dd2b30dcab31f6fdc90bed309e6b9ca09d0e Mon Sep 17 00:00:00 2001 From: Evan Huus Date: Thu, 20 Jun 2013 16:54:13 +0000 Subject: [PATCH] Add a few of our headers to code generated by pycrc (their faq says we can do basically whatever we want with it, and this cleans up a couple of licensecheck errors). Fix FSF address in one dissector. svn path=/trunk/; revision=50080 --- epan/dissectors/packet-udt.c | 2 +- wsutil/crc11.h | 25 +++++++++++++++++++++++++ wsutil/crc16-plain.c | 25 +++++++++++++++++++++++++ wsutil/crc16-plain.h | 25 +++++++++++++++++++++++++ 4 files changed, 76 insertions(+), 1 deletion(-) diff --git a/epan/dissectors/packet-udt.c b/epan/dissectors/packet-udt.c index 8c23562d500..fd793f9d989 100644 --- a/epan/dissectors/packet-udt.c +++ b/epan/dissectors/packet-udt.c @@ -24,7 +24,7 @@ * * 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 Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "config.h" diff --git a/wsutil/crc11.h b/wsutil/crc11.h index 0971f0726cb..eecda5ecccc 100644 --- a/wsutil/crc11.h +++ b/wsutil/crc11.h @@ -1,3 +1,28 @@ +/* + * crc11.h + * $Id$ + * + * http://www.tty1.net/pycrc/faq_en.html#code-ownership + * + * Wireshark - Network traffic analyzer + * By Gerald Combs + * Copyright 1998 Gerald Combs + * + * 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 + * of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + #ifndef __CRC11_____H__ #include diff --git a/wsutil/crc16-plain.c b/wsutil/crc16-plain.c index 60cec06fc03..736033c1ed1 100644 --- a/wsutil/crc16-plain.c +++ b/wsutil/crc16-plain.c @@ -1,3 +1,28 @@ +/* + * crc16-plain.c + * $Id$ + * + * http://www.tty1.net/pycrc/faq_en.html#code-ownership + * + * Wireshark - Network traffic analyzer + * By Gerald Combs + * Copyright 1998 Gerald Combs + * + * 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 + * of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + /** * $Id$ * \file crc16-plain.c diff --git a/wsutil/crc16-plain.h b/wsutil/crc16-plain.h index 178a6ef0fc4..da4e703a6c7 100644 --- a/wsutil/crc16-plain.h +++ b/wsutil/crc16-plain.h @@ -1,3 +1,28 @@ +/* + * crc16-plain.h + * $Id$ + * + * http://www.tty1.net/pycrc/faq_en.html#code-ownership + * + * Wireshark - Network traffic analyzer + * By Gerald Combs + * Copyright 1998 Gerald Combs + * + * 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 + * of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + /** * \file crc16-plain.h * Functions and types for CRC checks.