From 74dc568ef1759e783f20c3107624a9d39cb0f539 Mon Sep 17 00:00:00 2001 From: Jeff Morriss Date: Wed, 26 Jun 2013 00:18:44 +0000 Subject: [PATCH] As pointed out by Guy: timestats uses packet_info so it belongs in epan not wsutil. svn path=/trunk/; revision=50159 --- epan/CMakeLists.txt | 1 + epan/Makefile.common | 2 ++ {wsutil => epan}/timestats.c | 0 {wsutil => epan}/timestats.h | 2 +- tap-megaco-common.c | 2 +- ui/cli/tap-afpstat.c | 2 +- ui/cli/tap-camelsrt.c | 2 +- ui/cli/tap-comparestat.c | 2 +- ui/cli/tap-h225rassrt.c | 2 +- ui/cli/tap-megacostat.c | 2 +- ui/cli/tap-mgcpstat.c | 2 +- ui/cli/tap-radiusstat.c | 2 +- ui/cli/tap-smbstat.c | 2 +- ui/gtk/compare_stat.c | 2 +- ui/gtk/h225_ras_srt.c | 2 +- ui/gtk/megaco_stat.c | 2 +- ui/gtk/mgcp_stat.c | 2 +- ui/gtk/radius_stat.c | 2 +- ui/gtk/service_response_time_table.h | 2 +- wsutil/CMakeLists.txt | 1 - wsutil/Makefile.common | 2 -- 21 files changed, 19 insertions(+), 19 deletions(-) rename {wsutil => epan}/timestats.c (100%) rename {wsutil => epan}/timestats.h (98%) diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index b11ceaf361..f9ddbcd547 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -1472,6 +1472,7 @@ set(LIBWIRESHARK_FILES tap.c tcap-persistentdata.c timestamp.c + timestats.c tfs.c to_str.c tvbparse.c diff --git a/epan/Makefile.common b/epan/Makefile.common index 473b870e49..b9e84e8b2e 100644 --- a/epan/Makefile.common +++ b/epan/Makefile.common @@ -89,6 +89,7 @@ LIBWIRESHARK_SRC = \ tap.c \ tcap-persistentdata.c \ timestamp.c \ + timestats.c \ tfs.c \ to_str.c \ tvbparse.c \ @@ -237,6 +238,7 @@ LIBWIRESHARK_INCLUDES = \ tap-voip.h \ tcap-persistentdata.h \ timestamp.h \ + timestats.h \ tfs.h \ time_fmt.h \ to_str.h \ diff --git a/wsutil/timestats.c b/epan/timestats.c similarity index 100% rename from wsutil/timestats.c rename to epan/timestats.c diff --git a/wsutil/timestats.h b/epan/timestats.h similarity index 98% rename from wsutil/timestats.h rename to epan/timestats.h index 81e6d97042..43abdf1dbf 100644 --- a/wsutil/timestats.h +++ b/epan/timestats.h @@ -28,7 +28,7 @@ #include #include "epan/packet_info.h" -#include "nstime.h" +#include "wsutil/nstime.h" /* Summary of time statistics*/ typedef struct _timestat_t { diff --git a/tap-megaco-common.c b/tap-megaco-common.c index d4a033a0d4..159aa2333f 100644 --- a/tap-megaco-common.c +++ b/tap-megaco-common.c @@ -35,7 +35,7 @@ #include #include "epan/gcp.h" -#include "wsutil/timestats.h" +#include "epan/timestats.h" #include "../file.h" #include "../globals.h" #include "../stat_menu.h" diff --git a/ui/cli/tap-afpstat.c b/ui/cli/tap-afpstat.c index 8c5929d5c0..43db7d616f 100644 --- a/ui/cli/tap-afpstat.c +++ b/ui/cli/tap-afpstat.c @@ -33,7 +33,7 @@ #include #include #include -#include "wsutil/timestats.h" +#include "epan/timestats.h" /* used to keep track of the statistics for an entire program interface */ typedef struct _afpstat_t { diff --git a/ui/cli/tap-camelsrt.c b/ui/cli/tap-camelsrt.c index df27e857e0..2eb78990a7 100644 --- a/ui/cli/tap-camelsrt.c +++ b/ui/cli/tap-camelsrt.c @@ -35,7 +35,7 @@ #include "epan/asn1.h" #include "epan/dissectors/packet-camel.h" #include "epan/camel-persistentdata.h" -#include "wsutil/timestats.h" +#include "epan/timestats.h" #include "epan/stat_cmd_args.h" diff --git a/ui/cli/tap-comparestat.c b/ui/cli/tap-comparestat.c index de5e2ecbe0..a31931f3a5 100644 --- a/ui/cli/tap-comparestat.c +++ b/ui/cli/tap-comparestat.c @@ -45,7 +45,7 @@ #include #include #include -#include "wsutil/timestats.h" +#include "epan/timestats.h" /* For checksum */ diff --git a/ui/cli/tap-h225rassrt.c b/ui/cli/tap-h225rassrt.c index 155b368dea..8cf596bdc4 100644 --- a/ui/cli/tap-h225rassrt.c +++ b/ui/cli/tap-h225rassrt.c @@ -34,7 +34,7 @@ #include #include "epan/value_string.h" #include -#include "wsutil/timestats.h" +#include "epan/timestats.h" /* following values represent the size of their valuestring arrays */ #define NUM_RAS_STATS 7 diff --git a/ui/cli/tap-megacostat.c b/ui/cli/tap-megacostat.c index 9570b1b7b7..a56756e9eb 100644 --- a/ui/cli/tap-megacostat.c +++ b/ui/cli/tap-megacostat.c @@ -34,7 +34,7 @@ #include #include "epan/value_string.h" #include "epan/gcp.h" -#include "wsutil/timestats.h" +#include "epan/timestats.h" #include #include "tap-megaco-common.h" diff --git a/ui/cli/tap-mgcpstat.c b/ui/cli/tap-mgcpstat.c index 9ea2129fa9..2c764e2b15 100644 --- a/ui/cli/tap-mgcpstat.c +++ b/ui/cli/tap-mgcpstat.c @@ -32,7 +32,7 @@ #include #include "epan/value_string.h" #include "epan/dissectors/packet-mgcp.h" -#include "wsutil/timestats.h" +#include "epan/timestats.h" #define NUM_TIMESTATS 11 diff --git a/ui/cli/tap-radiusstat.c b/ui/cli/tap-radiusstat.c index 67522b8b46..42f6e7f8fe 100644 --- a/ui/cli/tap-radiusstat.c +++ b/ui/cli/tap-radiusstat.c @@ -32,7 +32,7 @@ #include #include "epan/value_string.h" #include -#include "wsutil/timestats.h" +#include "epan/timestats.h" typedef enum _radius_category { RADIUS_CAT_OVERALL = 0, diff --git a/ui/cli/tap-smbstat.c b/ui/cli/tap-smbstat.c index 153a086208..a1c6a9b761 100644 --- a/ui/cli/tap-smbstat.c +++ b/ui/cli/tap-smbstat.c @@ -32,7 +32,7 @@ #include #include "epan/value_string.h" #include -#include "wsutil/timestats.h" +#include "epan/timestats.h" #define MICROSECS_PER_SEC 1000000 #define NANOSECS_PER_SEC 1000000000 diff --git a/ui/gtk/compare_stat.c b/ui/gtk/compare_stat.c index c6f483e5c6..839fc2e997 100644 --- a/ui/gtk/compare_stat.c +++ b/ui/gtk/compare_stat.c @@ -54,7 +54,7 @@ #include #include "../stat_menu.h" -#include "wsutil/timestats.h" +#include "epan/timestats.h" #include "ui/simple_dialog.h" diff --git a/ui/gtk/h225_ras_srt.c b/ui/gtk/h225_ras_srt.c index 9b4b8b551c..20ab61edc6 100644 --- a/ui/gtk/h225_ras_srt.c +++ b/ui/gtk/h225_ras_srt.c @@ -36,7 +36,7 @@ #include #include -#include "wsutil/timestats.h" +#include "epan/timestats.h" #include "ui/simple_dialog.h" #include "../file.h" #include "../stat_menu.h" diff --git a/ui/gtk/megaco_stat.c b/ui/gtk/megaco_stat.c index 55cc7ead6f..4f4ea35340 100644 --- a/ui/gtk/megaco_stat.c +++ b/ui/gtk/megaco_stat.c @@ -38,7 +38,7 @@ #include "epan/gcp.h" #include -#include "wsutil/timestats.h" +#include "epan/timestats.h" #include "ui/simple_dialog.h" #include "../file.h" #include "../stat_menu.h" diff --git a/ui/gtk/mgcp_stat.c b/ui/gtk/mgcp_stat.c index 80d20ec958..08c51c3c65 100644 --- a/ui/gtk/mgcp_stat.c +++ b/ui/gtk/mgcp_stat.c @@ -35,7 +35,7 @@ #include #include "epan/dissectors/packet-mgcp.h" -#include "wsutil/timestats.h" +#include "epan/timestats.h" #include "ui/simple_dialog.h" #include "../file.h" #include "../stat_menu.h" diff --git a/ui/gtk/radius_stat.c b/ui/gtk/radius_stat.c index 595a027f72..8eea17ec19 100644 --- a/ui/gtk/radius_stat.c +++ b/ui/gtk/radius_stat.c @@ -35,7 +35,7 @@ #include #include -#include "wsutil/timestats.h" +#include "epan/timestats.h" #include "ui/simple_dialog.h" #include "../file.h" #include "../stat_menu.h" diff --git a/ui/gtk/service_response_time_table.h b/ui/gtk/service_response_time_table.h index 761ebd813a..f6505a6522 100644 --- a/ui/gtk/service_response_time_table.h +++ b/ui/gtk/service_response_time_table.h @@ -29,7 +29,7 @@ #include #include "wsutil/nstime.h" -#include "wsutil/timestats.h" +#include "epan/timestats.h" /** @file * Helper routines common to all service response time statistics tap. 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