aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2014-02-25 15:42:35 -0500
committerBill Meier <wmeier@newsguy.com>2014-02-25 20:46:49 +0000
commit11b5c15fdb815a2af400bfddef944dbac41a434a (patch)
treee7217ebcff4d4d9f7f95d0342b6776547e5537c3 /wiretap
parentc55c57ad72acda8cbce2841bc237f966bad5ae5b (diff)
Remove trailing whitespace
Change-Id: I8116f63ff88687c8db3fd6e8e23b22ab2f759af0 Reviewed-on: https://code.wireshark.org/review/385 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'wiretap')
-rw-r--r--wiretap/btsnoop.c2
-rw-r--r--wiretap/file_access.c2
-rw-r--r--wiretap/mpeg.c2
-rw-r--r--wiretap/vwr.c2
-rw-r--r--wiretap/wtap.c4
5 files changed, 6 insertions, 6 deletions
diff --git a/wiretap/btsnoop.c b/wiretap/btsnoop.c
index 3c67f84198..a3026517b2 100644
--- a/wiretap/btsnoop.c
+++ b/wiretap/btsnoop.c
@@ -336,7 +336,7 @@ static gboolean btsnoop_dump_h1(wtap_dumper *wdh,
/*
* Don't write out anything bigger than we can read.
* (This will also fail on a caplen of 0, as it should.)
- */
+ */
if (phdr->caplen-1 > WTAP_MAX_PACKET_SIZE) {
*err = WTAP_ERR_PACKET_TOO_LARGE;
return FALSE;
diff --git a/wiretap/file_access.c b/wiretap/file_access.c
index 97b9c7f5f6..df32f1cee9 100644
--- a/wiretap/file_access.c
+++ b/wiretap/file_access.c
@@ -506,7 +506,7 @@ static char *get_file_extension(const char *pathname)
extensionp = g_strdup(extensionp);
g_strfreev(components);
return extensionp;
-}
+}
static gboolean heuristic_uses_extension(unsigned int i, const char *extension)
{
diff --git a/wiretap/mpeg.c b/wiretap/mpeg.c
index dcccd6ade1..326bf98630 100644
--- a/wiretap/mpeg.c
+++ b/wiretap/mpeg.c
@@ -222,7 +222,7 @@ mpeg_read_packet(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, Buffer *buf,
return TRUE;
}
-static gboolean
+static gboolean
mpeg_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset)
{
*data_offset = file_tell(wth->fh);
diff --git a/wiretap/vwr.c b/wiretap/vwr.c
index fde668f997..932acf7023 100644
--- a/wiretap/vwr.c
+++ b/wiretap/vwr.c
@@ -814,7 +814,7 @@ static int vwr_get_fpga_version(wtap *wth, int *err, gchar **err_info)
guint16 data_length = 0;
guint16 fpga_version;
int valid_but_empty_file = -1;
-
+
filePos = file_tell(wth->fh);
if (filePos == -1) {
*err = file_error(wth->fh, err_info);
diff --git a/wiretap/wtap.c b/wiretap/wtap.c
index 28bba7a79c..c7f344e6b0 100644
--- a/wiretap/wtap.c
+++ b/wiretap/wtap.c
@@ -690,8 +690,8 @@ static struct encap_type_info encap_table_base[] = {
/* WTAP_ENCAP_STANAG_4607 */
{ "STANAG 4607", "s4607" },
- /* WTAP_ENCAP_STANAG_5066_D_PDU */
- { "STANAG 5066 Data Transfer Sublayer PDUs(D_PDU)", "s5066-dpdu"},
+ /* WTAP_ENCAP_STANAG_5066_D_PDU */
+ { "STANAG 5066 Data Transfer Sublayer PDUs(D_PDU)", "s5066-dpdu"},
/* WTAP_ENCAP_NETLINK */
{ "Netlink", "Linux netlink" },