diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2013-10-18 13:06:05 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2013-10-18 13:06:05 +0000 |
| commit | 662c7704f871f58bf85421701d04f0881a6a1bd8 (patch) | |
| tree | 728a31b72d35b8fd85bc7a86ce3c5be397526c6a /epan | |
| parent | 2197f291e536036c386acde07a6bead9a636434c (diff) | |
| download | wireshark-662c7704f871f58bf85421701d04f0881a6a1bd8.tar.gz | |
After looking for something in the column-*.h files and
not finding it, I finally found it in column_info.h
Renamed column_info.h to column-info.h to have consistency
with the column*h files.
svn path=/trunk/; revision=52667
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/column-info.h (renamed from epan/column_info.h) | 2 | ||||
| -rw-r--r-- | epan/column-utils.c | 2 | ||||
| -rw-r--r-- | epan/column-utils.h | 2 | ||||
| -rw-r--r-- | epan/column.c | 4 | ||||
| -rw-r--r-- | epan/epan.h | 2 | ||||
| -rw-r--r-- | epan/frame_data.h | 2 | ||||
| -rw-r--r-- | epan/packet.h | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/epan/column_info.h b/epan/column-info.h index 5e5c151b9f..6cfb695a2a 100644 --- a/epan/column_info.h +++ b/epan/column-info.h @@ -1,4 +1,4 @@ -/* column_info.h +/* column-info.h * Definitions for column structures and routines * * $Id$ diff --git a/epan/column-utils.c b/epan/column-utils.c index 3da1cc91fd..9ece8e7f1d 100644 --- a/epan/column-utils.c +++ b/epan/column-utils.c @@ -38,7 +38,7 @@ #include "ipv6-utils.h" #include "osi-utils.h" #include "value_string.h" -#include "column_info.h" +#include "column-info.h" #include "proto.h" #include <epan/strutil.h> diff --git a/epan/column-utils.h b/epan/column-utils.h index 1ea0fd39ce..e2edd5641a 100644 --- a/epan/column-utils.h +++ b/epan/column-utils.h @@ -27,7 +27,7 @@ #include <glib.h> -#include "column_info.h" +#include "column-info.h" #include "packet_info.h" #include <epan/epan.h> #include "ws_symbol_export.h" diff --git a/epan/column.c b/epan/column.c index fefe9de2c4..d012f8f3ed 100644 --- a/epan/column.c +++ b/epan/column.c @@ -39,7 +39,7 @@ #include <epan/column.h> #include <epan/packet.h> -/* Given a format number (as defined in column_info.h), returns its equivalent +/* Given a format number (as defined in column-info.h), returns its equivalent string */ const gchar * col_format_to_string(const gint fmt) { @@ -113,7 +113,7 @@ col_format_to_string(const gint fmt) { return(slist[fmt]); } -/* Given a format number (as defined in column_info.h), returns its +/* Given a format number (as defined in column-info.h), returns its description */ const gchar * col_format_desc(const gint fmt) { diff --git a/epan/epan.h b/epan/epan.h index f022cf2fa6..cfa7a4d046 100644 --- a/epan/epan.h +++ b/epan/epan.h @@ -30,7 +30,7 @@ extern "C" { #include <glib.h> #include "frame_data.h" -#include "column_info.h" +#include "column-info.h" #include "register.h" #include "ws_symbol_export.h" diff --git a/epan/frame_data.h b/epan/frame_data.h index 57f95e5c0b..72f30db7f3 100644 --- a/epan/frame_data.h +++ b/epan/frame_data.h @@ -25,7 +25,7 @@ #ifndef __FRAME_DATA_H__ #define __FRAME_DATA_H__ -#include <epan/column_info.h> +#include <epan/column-info.h> #include <epan/tvbuff.h> #include <wsutil/nstime.h> #include "ws_symbol_export.h" diff --git a/epan/packet.h b/epan/packet.h index f5b81bf076..fd75b4ccbf 100644 --- a/epan/packet.h +++ b/epan/packet.h @@ -31,7 +31,7 @@ #include "wsutil/pint.h" #include "to_str.h" #include "value_string.h" -#include "column_info.h" +#include "column-info.h" #include "frame_data.h" #include "packet_info.h" #include "column-utils.h" |