git://git.exim.org
/
users
/
jgh
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update to pre-4.87 master
[users/jgh/exim.git]
/
src
/
src
/
mime.h
diff --git
a/src/src/mime.h
b/src/src/mime.h
index af09f677d61ceee4644b9c8b45301f03fbbea4d8..f2b9cf65d7a74510820e31dfc0616cf215f1038a 100644
(file)
--- a/
src/src/mime.h
+++ b/
src/src/mime.h
@@
-2,7
+2,7
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) Tom Kistner <tom@duncanthrax.net> 2004 */
+/* Copyright (c) Tom Kistner <tom@duncanthrax.net> 2004
, 2015
*/
/* License: GPL */
#ifdef WITH_CONTENT_SCAN
/* License: GPL */
#ifdef WITH_CONTENT_SCAN
@@
-22,17
+22,17
@@
struct mime_boundary_context
};
typedef struct mime_header {
};
typedef struct mime_header {
- uschar *name;
- int namelen;
-
void *
value;
+ uschar *
name;
+ int
namelen;
+
uschar **
value;
} mime_header;
static mime_header mime_header_list[] = {
} mime_header;
static mime_header mime_header_list[] = {
- { US"content-type:", 13, &mime_content_type },
- { US"content-disposition:", 20, &mime_content_disposition },
+ { US"content-type:",
13, &mime_content_type },
+ { US"content-disposition:",
20, &mime_content_disposition },
{ US"content-transfer-encoding:", 26, &mime_content_transfer_encoding },
{ US"content-transfer-encoding:", 26, &mime_content_transfer_encoding },
- { US"content-id:", 11, &mime_content_id },
- { US"content-description:",
20
, &mime_content_description }
+ { US"content-id:",
11, &mime_content_id },
+ { US"content-description:",
20
, &mime_content_description }
};
static int mime_header_list_size = sizeof(mime_header_list)/sizeof(mime_header);
};
static int mime_header_list_size = sizeof(mime_header_list)/sizeof(mime_header);
@@
-48,12
+48,10
@@
typedef struct mime_parameter {
static mime_parameter mime_parameter_list[] = {
{ US"name=", 5, &mime_filename },
{ US"filename=", 9, &mime_filename },
static mime_parameter mime_parameter_list[] = {
{ US"name=", 5, &mime_filename },
{ US"filename=", 9, &mime_filename },
- { US"charset=", 8, &mime_charset },
+ { US"charset=", 8, &mime_charset
},
{ US"boundary=", 9, &mime_boundary }
};
{ US"boundary=", 9, &mime_boundary }
};
-static int mime_parameter_list_size = sizeof(mime_parameter_list)/sizeof(mime_parameter);
-
/* MIME Anomaly list */
#define MIME_ANOMALY_BROKEN_BASE64 2, "Broken BASE64 encoding detected"
/* MIME Anomaly list */
#define MIME_ANOMALY_BROKEN_BASE64 2, "Broken BASE64 encoding detected"