Remove the no more used gmt2local() function

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab5f8355893de9aa867574453b030ea2e0eb844f..05b4e19611ab834f09953f28d6c50e1e8b838188 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -899,7 +899,6 @@ set(NETDISSECT_SOURCE_LIST_C
     checksum.c
     cpack.c
     gmpls.c
-    gmt2local.c
     in_cksum.c
     ipproto.c
     l2vpn.c

diff --git a/INSTALL.txt b/INSTALL.txt
index 682c31befaf840d480292956a275de6922aab573..662eb0c3316063b65b88776f0a859d1a90cb5358 100644 (file)
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -70,8 +70,6 @@ ethertype.h   - Ethernet type value definitions
 extract.h      - alignment definitions
 gmpls.c                - GMPLS definitions
 gmpls.h                - GMPLS declarations
-gmt2local.c    - time conversion routines
-gmt2local.h    - time conversion prototypes
 install-sh     - BSD style install script
 interface.h    - globals, prototypes and definitions
 ip.h           - IP definitions

diff --git a/Makefile.in b/Makefile.in
index d53735b01f58b88845029f177f2a51e4e68571bf..545cc33d575ea464476d165c59a5b8f71ebfaf40 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -80,7 +80,6 @@ LIBNETDISSECT_SRC=\
        checksum.c \
        cpack.c \
        gmpls.c \
-       gmt2local.c \
        in_cksum.c \
        ipproto.c \
        l2vpn.c \
@@ -267,7 +266,6 @@ HDR = \
        getopt_long.h \
        getservent.h \
        gmpls.h \
-       gmt2local.h \
        interface.h \
        ip.h \
        ip6.h \

diff --git a/gmt2local.c b/gmt2local.c
deleted file mode 100644 (file)
index fbfba64..0000000
--- a/gmt2local.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 1997
- *     The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "netdissect-stdinc.h"
-
-#include <stdio.h>
-
-#ifdef HAVE_OS_PROTO_H
-#include "os-proto.h"
-#endif
-
-#include "gmt2local.h"
-
-/*
- * Returns the difference between gmt and local time in seconds.
- * Use gmtime() and localtime() to keep things simple.
- */
-int32_t
-gmt2local(time_t t)
-{
-       int dt, dir;
-       struct tm *gmt, *loc;
-       struct tm sgmt;
-
-       if (t == 0)
-               t = time(NULL);
-       gmt = &sgmt;
-       *gmt = *gmtime(&t);
-       loc = localtime(&t);
-       dt = (loc->tm_hour - gmt->tm_hour) * 60 * 60 +
-           (loc->tm_min - gmt->tm_min) * 60;
-
-       /*
-        * If the year or julian day is different, we span 00:00 GMT
-        * and must add or subtract a day. Check the year first to
-        * avoid problems when the julian day wraps.
-        */
-       dir = loc->tm_year - gmt->tm_year;
-       if (dir == 0)
-               dir = loc->tm_yday - gmt->tm_yday;
-       dt += dir * 24 * 60 * 60;
-
-       return (dt);
-}

diff --git a/gmt2local.h b/gmt2local.h
deleted file mode 100644 (file)
index 89254df..0000000
--- a/gmt2local.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 1997
- *     The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-#ifndef gmt2local_h
-#define gmt2local_h
-
-int32_t gmt2local(time_t);
-#endif

diff --git a/win32/prj/GNUmakefile b/win32/prj/GNUmakefile
index a7b63e8a85233b65a281a125ca5d5dbf6f443776..d5fe3ec1a722d934e20e800d0c1b711c65627bf8 100644 (file)
--- a/win32/prj/GNUmakefile
+++ b/win32/prj/GNUmakefile
@@ -31,7 +31,6 @@ OBJS = \
        ../../af.o \
        ../../checksum.o \
        ../../gmpls.o \
-       ../../gmt2local.o \
        ../../missing/inet_aton.o \
        ../../missing/inet_ntop.o \
        ../../missing/strlcpy.o \

diff --git a/win32/prj/WinDump.dsp b/win32/prj/WinDump.dsp
index 6f7276ee6d46b204ee24d1c1e2c918e425c38354..1808774eaaf0cc1ed0ed33482156a011bbb6b02f 100644 (file)
--- a/win32/prj/WinDump.dsp
+++ b/win32/prj/WinDump.dsp
@@ -129,10 +129,6 @@ SOURCE=..\..\gmpls.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\gmt2local.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\in_cksum.c
 # End Source File
 # Begin Source File

diff --git a/win32/prj/WinDump.vcproj b/win32/prj/WinDump.vcproj
index fb13a855db68fc428792673409bff584d76645b1..0fead8fad414a3e42b1ec58bb8277136fd4379fc 100644 (file)
--- a/win32/prj/WinDump.vcproj
+++ b/win32/prj/WinDump.vcproj
@@ -446,28 +446,6 @@
                                />
                        </FileConfiguration>
                </File>
-               <File
-                       RelativePath="..\..\gmt2local.c"
-                       >
-                       <FileConfiguration
-                               Name="Debug|Win32"
-                               >
-                               <Tool
-                                       Name="VCCLCompilerTool"
-                                       AdditionalIncludeDirectories=""
-                                       PreprocessorDefinitions=""
-                               />
-                       </FileConfiguration>
-                       <FileConfiguration
-                               Name="Release|Win32"
-                               >
-                               <Tool
-                                       Name="VCCLCompilerTool"
-                                       AdditionalIncludeDirectories=""
-                                       PreprocessorDefinitions=""
-                               />
-                       </FileConfiguration>
-               </File>
                <File
                        RelativePath="..\..\in_cksum.c"
                        >