summaryrefslogtreecommitdiff
path: root/wiretap/mime_file.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2013-01-30 22:55:32 +0000
committerGuy Harris <guy@alum.mit.edu>2013-01-30 22:55:32 +0000
commitb2fd8951357e2b674d53ead1d42ee9b25e17d7fb (patch)
treee925ab5d2750d4f94ab5ad6206f4bd3bf96e02b4 /wiretap/mime_file.c
parente9479b543f9344b0dd868be1744197fe5aa85764 (diff)
downloadwireshark-b2fd8951357e2b674d53ead1d42ee9b25e17d7fb.tar.gz
Clean up white space.
Define the PNG magic number as a mixture of hex and ASCII, to make it a bit clearer what's going on. svn path=/trunk/; revision=47378
Diffstat (limited to 'wiretap/mime_file.c')
-rw-r--r--wiretap/mime_file.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/wiretap/mime_file.c b/wiretap/mime_file.c
index 5d9000f5ca..6c64d0e640 100644
--- a/wiretap/mime_file.c
+++ b/wiretap/mime_file.c
@@ -73,16 +73,16 @@ static const guint8 jpeg_jfif_magic[] = { 0xFF, 0xD8, /* SOF */
/* <?xml */
static const guint8 xml_magic[] = { '<', '?', 'x', 'm', 'l' };
-static const guint8 png_magic[] = { 137, 80, 78, 71, 13, 10, 26, 10 };
+static const guint8 png_magic[] = { 0x89, 'P', 'N', 'G', '\r', '\n', 0x1A, '\n' };
static const guint8 gif87a_magic[] = { 'G', 'I', 'F', '8', '7', 'a'};
static const guint8 gif89a_magic[] = { 'G', 'I', 'F', '8', '9', 'a'};
static const mime_files_t magic_files[] = {
{ jpeg_jfif_magic, sizeof(jpeg_jfif_magic) },
{ xml_magic, sizeof(xml_magic) },
- { png_magic, sizeof(png_magic) },
- { gif87a_magic, sizeof(gif87a_magic) },
- { gif89a_magic, sizeof(gif89a_magic) }
+ { png_magic, sizeof(png_magic) },
+ { gif87a_magic, sizeof(gif87a_magic) },
+ { gif89a_magic, sizeof(gif89a_magic) }
};
#define N_MAGIC_TYPES (sizeof(magic_files) / sizeof(magic_files[0]))