As pointed out by Guy: timestats uses packet_info so it belongs in epan

not wsutil.

svn path=/trunk/; revision=50159

4 files changed, 0 insertions, 149 deletions

diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt
index 97da38cbc5..569f3b86a9 100644
--- a/wsutil/CMakeLists.txt
+++ b/wsutil/CMakeLists.txt
@@ -50,7 +50,6 @@ set(WSUTIL_FILES
   nstime.c
   privileges.c
   str_util.c
-  timestats.c
   type_util.c
   ${WSUTIL_PLATFORM_FILES}
 )
diff --git a/wsutil/Makefile.common b/wsutil/Makefile.common
index 712c6c8448..5fc9a426ba 100644
--- a/wsutil/Makefile.common
+++ b/wsutil/Makefile.common
@@ -44,7 +44,6 @@ LIBWSUTIL_SRC = 	\
 	nstime.c	\
 	privileges.c	\
 	str_util.c	\
-	timestats.c	\
 	type_util.c
 
 # Header files that are not generated from other files
@@ -63,5 +62,4 @@ LIBWSUTIL_INCLUDES = 	\
 	nstime.h	\
 	privileges.h	\
 	str_util.h	\
-	timestats.h	\
 	type_util.h
diff --git a/wsutil/timestats.c b/wsutil/timestats.c
deleted file mode 100644
index 9803999b91..0000000000
--- a/wsutil/timestats.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/* timestats.c
- * routines for time statistics
- * Copyrigth 2003 Lars Roland
- *
- * $Id$
- *
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald@wireshark.org>
- * 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.
- */
-
-#include "config.h"
-
-#include "timestats.h"
-
-/* Initialize a timestat_t struct */
-void
-time_stat_init(timestat_t *stats)
-{
-	stats->num = 0;
-	stats->min_num = 0;
-	stats->max_num = 0;
-	nstime_set_zero(&stats->min);
-	nstime_set_zero(&stats->max);
-	nstime_set_zero(&stats->tot);
-	stats->variance = 0.0;
-}
-
-/* Update a timestat_t struct with a new sample */
-void
-time_stat_update(timestat_t *stats, const nstime_t *delta, packet_info *pinfo)
-{
-	if(stats->num==0){
-		stats->max=*delta;
-		stats->max_num=pinfo->fd->num;
-		stats->min=*delta;
-		stats->min_num=pinfo->fd->num;
-	}
-
-	if( (delta->secs<stats->min.secs)
-	||( (delta->secs==stats->min.secs)
-	  &&(delta->nsecs<stats->min.nsecs) ) ){
-		stats->min=*delta;
-		stats->min_num=pinfo->fd->num;
-	}
-
-	if( (delta->secs>stats->max.secs)
-	||( (delta->secs==stats->max.secs)
-	  &&(delta->nsecs>stats->max.nsecs) ) ){
-		stats->max=*delta;
-		stats->max_num=pinfo->fd->num;
-	}
-
-	nstime_add(&stats->tot, delta);
-
-	stats->num++;
-}
-
-/*
- * get_average - function
- *
- * function to calculate the average
- * returns the average as a gdouble , time base is milli seconds
- */
-
-gdouble get_average(const nstime_t *sum, guint32 num)
-{
-	gdouble average;
-
-	if(num > 0) {
-		average = (double)sum->secs*1000 + (double)sum->nsecs/1000000;
-		average /= num;
-	}
-	else {
-		average = 0;
-	}
-	return average;
-}
diff --git a/wsutil/timestats.h b/wsutil/timestats.h
deleted file mode 100644
index 81e6d97042..0000000000
--- a/wsutil/timestats.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* timestats.h
- * Routines and definitions for time statistics
- * Copyrigth 2003 Lars Roland
- *
- * $Id$
- *
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald@wireshark.org>
- * 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 _time_stat
-#define _time_stat
-
-#include <glib.h>
-#include "epan/packet_info.h"
-#include "nstime.h"
-
- /* Summary of time statistics*/
-typedef struct _timestat_t {
-	guint32 num;	 /* number of samples */
-	guint32	min_num; /* frame number of minimum */
-	guint32	max_num; /* frame number of maximum */
-	nstime_t min;
-	nstime_t max;
-	nstime_t tot;
-	gdouble variance;
-} timestat_t;
-
-/* functions */
-
-/* Initialize a timestat_t struct */
-WS_DLL_PUBLIC void time_stat_init(timestat_t *stats);
-
-/* Update a timestat_t struct with a new sample */
-WS_DLL_PUBLIC void time_stat_update(timestat_t *stats, const nstime_t *delta, packet_info *pinfo);
-
-WS_DLL_PUBLIC gdouble get_average(const nstime_t *sum, guint32 num);
-
-#endif