From d0bd2097f0393fe28e45b802a8418e86eafb2ae2 Mon Sep 17 00:00:00 2001 From: Evan Huus Date: Tue, 16 Apr 2013 00:00:09 +0000 Subject: Fix another dozen or so files with bad FSF addresses as caught by licensecheck. svn path=/trunk/; revision=48869 --- capture_unix_ifnames.h | 2 +- capture_win_ifnames.h | 2 +- epan/diam_dict.h | 5 ++--- epan/dissectors/packet-negoex.c | 2 +- epan/dissectors/packet-rmcp.c | 3 +-- plugins/asn1/asn1.c | 2 +- plugins/asn1/asn1.h | 2 +- plugins/irda/packet-sir.c | 2 +- plugins/wimaxmacphy/packet-wimaxmacphy.h | 2 +- ui/gtk/rlc_lte_graph.c | 2 +- wsutil/strncasecmp.c | 4 ++-- wsutil/strptime.c | 4 ++-- wsutil/wsgetopt.c | 6 +++--- wsutil/wsgetopt.h | 6 +++--- wsutil/wsgetopt_int.h | 4 ++-- 15 files changed, 23 insertions(+), 25 deletions(-) diff --git a/capture_unix_ifnames.h b/capture_unix_ifnames.h index 99662522b6..7e93754078 100644 --- a/capture_unix_ifnames.h +++ b/capture_unix_ifnames.h @@ -20,7 +20,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. */ #ifndef CAPTURE_UNIX_IFNAMES_H diff --git a/capture_win_ifnames.h b/capture_win_ifnames.h index 513ac74296..e5aa5d02f7 100644 --- a/capture_win_ifnames.h +++ b/capture_win_ifnames.h @@ -20,7 +20,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. */ #ifndef CAPTURE_WIN_IFNAMES_H diff --git a/epan/diam_dict.h b/epan/diam_dict.h index 9f0a4f601e..4c97213d9c 100644 --- a/epan/diam_dict.h +++ b/epan/diam_dict.h @@ -17,9 +17,8 @@ ** Library General Public License for more details. ** ** You should have received a copy of the GNU Library General Public - ** License along with this library; if not, write to the - ** Free Software Foundation, Inc., 59 Temple Place - Suite 330, - ** Boston, MA 02111-1307, USA. + ** License along with this library; if not, write to the Free Software + ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #ifndef _DIAM_DICT_H_ diff --git a/epan/dissectors/packet-negoex.c b/epan/dissectors/packet-negoex.c index 5ca3c6471c..e3ac88fd63 100644 --- a/epan/dissectors/packet-negoex.c +++ b/epan/dissectors/packet-negoex.c @@ -22,7 +22,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/epan/dissectors/packet-rmcp.c b/epan/dissectors/packet-rmcp.c index 20e28c854d..2cbc28699c 100644 --- a/epan/dissectors/packet-rmcp.c +++ b/epan/dissectors/packet-rmcp.c @@ -23,8 +23,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/plugins/asn1/asn1.c b/plugins/asn1/asn1.c index 5e2080ed91..7390990bdf 100644 --- a/plugins/asn1/asn1.c +++ b/plugins/asn1/asn1.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., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ /* diff --git a/plugins/asn1/asn1.h b/plugins/asn1/asn1.h index 880575930f..49cdbc7317 100644 --- a/plugins/asn1/asn1.h +++ b/plugins/asn1/asn1.h @@ -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., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * */ #ifndef __ASN1_H__ diff --git a/plugins/irda/packet-sir.c b/plugins/irda/packet-sir.c index da9856bf6d..3259aaea1a 100644 --- a/plugins/irda/packet-sir.c +++ b/plugins/irda/packet-sir.c @@ -21,7 +21,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/plugins/wimaxmacphy/packet-wimaxmacphy.h b/plugins/wimaxmacphy/packet-wimaxmacphy.h index a767d1e158..9b5af45e24 100644 --- a/plugins/wimaxmacphy/packet-wimaxmacphy.h +++ b/plugins/wimaxmacphy/packet-wimaxmacphy.h @@ -19,7 +19,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. */ #ifndef __PACKET_WIMAXASNCP_H__ diff --git a/ui/gtk/rlc_lte_graph.c b/ui/gtk/rlc_lte_graph.c index d20bca5611..28663f2601 100644 --- a/ui/gtk/rlc_lte_graph.c +++ b/ui/gtk/rlc_lte_graph.c @@ -20,7 +20,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/strncasecmp.c b/wsutil/strncasecmp.c index a679e85c14..88adc48ac5 100644 --- a/wsutil/strncasecmp.c +++ b/wsutil/strncasecmp.c @@ -13,8 +13,8 @@ Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ +not, write to the Free Software Foundation, Inc., 51 Franklin Street, +Fifth Floor, Boston, MA 02110-1301 USA. */ #include #include diff --git a/wsutil/strptime.c b/wsutil/strptime.c index 1680fa26a7..64fe57a2ca 100644 --- a/wsutil/strptime.c +++ b/wsutil/strptime.c @@ -15,8 +15,8 @@ You should have received a copy of the GNU Library General Public License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. */ /* XXX This version of the implementation is not really complete. Some of the fields cannot add information alone. But if seeing diff --git a/wsutil/wsgetopt.c b/wsutil/wsgetopt.c index 44b71af209..844ada7643 100644 --- a/wsutil/wsgetopt.c +++ b/wsutil/wsgetopt.c @@ -20,9 +20,9 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ + License along with the GNU C Library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ /* This tells Alpha OSF/1 not to define a getopt prototype in . Ditto for AIX 3.2 and . */ diff --git a/wsutil/wsgetopt.h b/wsutil/wsgetopt.h index 41054d1cc9..09756afb7f 100644 --- a/wsutil/wsgetopt.h +++ b/wsutil/wsgetopt.h @@ -14,9 +14,9 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ + License along with the GNU C Library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #ifndef _GETOPT_H diff --git a/wsutil/wsgetopt_int.h b/wsutil/wsgetopt_int.h index bad71eaf45..b30b8017a9 100644 --- a/wsutil/wsgetopt_int.h +++ b/wsutil/wsgetopt_int.h @@ -18,8 +18,8 @@ You should have received a copy of the GNU Lesser General Public License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA. */ #ifndef _GETOPT_INT_H #define _GETOPT_INT_H 1 -- cgit v1.2.3