Fix invalid pointer arithmetic.

[nmh] / h / mhparse.h

diff --git a/h/mhparse.h b/h/mhparse.h
index 256586f370844ec886d43884b1f1be60dbce8855..3b4021f5ddf2ceedb4550d48144c535a2e9bf041 100644 (file)
--- a/h/mhparse.h
+++ b/h/mhparse.h
@@ -2,10 +2,6 @@
  *           -- (mhparse.c/mhbuildsbr.c)
  */
 
  *           -- (mhparse.c/mhbuildsbr.c)
  */
 

-#define        NPARTS  50
-#define        NTYPES  20
-#define        NPREFS  20
-

 /*
  * Abstract type for header fields
  */
 /*
  * Abstract type for header fields
  */


@@ -357,26 +353,16 @@ int get_ctinfo (char *, CT, int);
 int params_external (CT, int);
 int open7Bit (CT, char **);
 void close_encoding (CT);
 int params_external (CT, int);
 int open7Bit (CT, char **);
 void close_encoding (CT);

-char *ct_type_str (int);
-char *ct_subtype_str (int, int);
-int ct_str_type (const char *);
-int ct_str_subtype (int, const char *);
-const struct str2init *get_ct_init (int);
-const char *ce_str (int);
-const struct str2init *get_ce_method (const char *);
+char *ct_type_str (int) CONST;
+char *ct_subtype_str (int, int) CONST;
+int ct_str_type (const char *) PURE;
+int ct_str_subtype (int, const char *) PURE;
+const struct str2init *get_ct_init (int) PURE;
+const char *ce_str (int) CONST;
+const struct str2init *get_ce_method (const char *) PURE;

 char *content_charset (CT);
 void reverse_alternative_parts (CT);
 
 char *content_charset (CT);
 void reverse_alternative_parts (CT);
 

-/*
- * Given a content structure, return true if the content has a disposition
- * of "inline".
- *
- * Arguments are:
- *
- * ct          - Content structure to examine
- */
-int is_inline(CT ct);
-

 /*
  * Given a list of messages, display information about them on standard
  * output.
 /*
  * Given a list of messages, display information about them on standard
  * output.


@@ -529,6 +515,21 @@ extern int checksw;        /* Add Content-MD5 field */
  */
 typedef struct mhstoreinfo *mhstoreinfo_t;
 mhstoreinfo_t mhstoreinfo_create(CT *, char *, const char *, int, int);
  */
 typedef struct mhstoreinfo *mhstoreinfo_t;
 mhstoreinfo_t mhstoreinfo_create(CT *, char *, const char *, int, int);

-int mhstoreinfo_files_not_clobbered(const mhstoreinfo_t);
+int mhstoreinfo_files_not_clobbered(const mhstoreinfo_t) PURE;

 void mhstoreinfo_free(mhstoreinfo_t);
 void store_all_messages (mhstoreinfo_t);
 void mhstoreinfo_free(mhstoreinfo_t);
 void store_all_messages (mhstoreinfo_t);

+
+extern bool skip_mp_cte_check;
+extern bool suppress_bogus_mp_content_warning;
+extern bool bogus_mp_content;
+extern bool suppress_extraneous_trailing_semicolon_warning;
+
+extern bool suppress_multiple_mime_version_warning;
+
+#define        NPREFS  20
+typedef struct {
+    char *type;
+    char *subtype;
+} mime_type_subtype;
+extern mime_type_subtype mime_preference[NPREFS];
+extern int npreferred;