aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2015-06-10 21:59:31 -0400
committerBill Meier <wmeier@newsguy.com>2015-06-11 02:15:35 +0000
commit4c3677ef3b640ad78d6e4c5d3c0a0268d5a2c8ea (patch)
tree21bf6425b4b331b659fea9f1c72888e362dde4a2 /wiretap
parentdcf69bb2717f50948a19655898ba1495486c0c0e (diff)
Replace tabs in files with editor modeline "expandtab"
Change-Id: I4667fd4091c510a4c798f79dae333a07dc42dad6 Reviewed-on: https://code.wireshark.org/review/8880 Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'wiretap')
-rw-r--r--wiretap/json.h2
-rw-r--r--wiretap/pcapng.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/json.h b/wiretap/json.h
index 8c233cb771..704e155eee 100644
--- a/wiretap/json.h
+++ b/wiretap/json.h
@@ -35,7 +35,7 @@
*
* For now, go for 50MB.
*/
-#define MAX_FILE_SIZE (50*1024*1024)
+#define MAX_FILE_SIZE (50*1024*1024)
wtap_open_return_val json_open(wtap *wth, int *err, gchar **err_info);
diff --git a/wiretap/pcapng.c b/wiretap/pcapng.c
index aaec91345a..a18d50de05 100644
--- a/wiretap/pcapng.c
+++ b/wiretap/pcapng.c
@@ -2001,7 +2001,7 @@ pcapng_read_interface_statistics_block(FILE_T fh, pcapng_block_header_t *bh, pca
/* Don't cast a guint8 * into a guint32 *--the
* guint8 * may not point to something that's
- * aligned correctly.
+ * aligned correctly.
*/
memcpy(&high, option_content, sizeof(guint32));
memcpy(&low, option_content + sizeof(guint32), sizeof(guint32));