Added missing prototypes, protected

argument decls with __P and the whole stuff with extern "C".

1 files changed, 58 insertions, 24 deletions

diff --git a/include/mailutils/mailcap.h b/include/mailutils/mailcap.h
index 19cdc588c..c4fa08fa2 100644
--- a/include/mailutils/mailcap.h
+++ b/include/mailutils/mailcap.h
@@ -23,64 +23,98 @@
 
 /* See RFC1524 (A User Agent Configuration Mechanism).  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Create a mailcap from stream.  */
-int mu_mailcap_create (mu_mailcap_t * mailcap, stream_t stream);
+int mu_mailcap_create __P((mu_mailcap_t * mailcap, stream_t stream));
 
 /* Destroy mailcap object.  */
-void mu_mailcap_destroy (mu_mailcap_t * mailcap);
+void mu_mailcap_destroy __P((mu_mailcap_t * mailcap));
 
 /* Return the number of entries in the mailcap file.  */
-int mu_mailcap_entries_count (mu_mailcap_t mailcap, size_t *pno);
+int mu_mailcap_entries_count __P((mu_mailcap_t mailcap, size_t *pno));
 
 /* Return the mailcap record number, no, of the mailcap file .  */
-int mu_mailcap_get_entry (mu_mailcap_t mailcap, size_t no, mu_mailcap_entry_t *entry);
+int mu_mailcap_get_entry __P((mu_mailcap_t mailcap, size_t no,
+			      mu_mailcap_entry_t *entry));
+
+/* Return the number of fields in a mailcap entry */  
+int mu_mailcap_entry_fields_count __P((mu_mailcap_entry_t entry,
+				       size_t *pcount));
 
 /* Save in buffer[] the content-type of the record.  */
-int mu_mailcap_entry_get_typefield (mu_mailcap_entry_t entry, char *buffer, size_t buflen, size_t *pn);
+int mu_mailcap_entry_get_typefield __P((mu_mailcap_entry_t entry,
+					char *buffer, size_t buflen,
+					size_t *pn));
 
 /* Save in buffer[] the view command of the record.  */
-int mu_mailcap_entry_get_viewcommand (mu_mailcap_entry_t entry, char *buffer, size_t buflen, size_t *pn);
+int mu_mailcap_entry_get_viewcommand __P((mu_mailcap_entry_t entry,
+					  char *buffer, size_t buflen,
+					  size_t *pn));
 
 /* Save in buffer[] the field number no the record .  */
-int mu_mailcap_entry_get_field (mu_mailcap_entry_t entry, size_t no, char *buffer, size_t buflen, size_t *pn);
+int mu_mailcap_entry_get_field __P((mu_mailcap_entry_t entry, size_t no,
+				    char *buffer, size_t buflen, size_t *pn));
 
 /* Save in buffer the value of a key:
- * mu_mailcap_entry_get_value (entry, "compose", buffer, buflen, pn);
- * i.e compose="lynx %s" -->  "lynx %s" will be save in buffer without the quotes.  */
-int mu_mailcap_entry_get_value (mu_mailcap_entry_t entry, const char *key, char *buffer, size_t buflen, size_t *pn);
-
+ * mu_mailcap_entry_get_value __P((entry, "compose", buffer, buflen, pn));
+ * i.e compose="lynx %s" -->  "lynx %s" will be saved in the buffer without
+ * the quotes.  */
+int mu_mailcap_entry_get_value __P((mu_mailcap_entry_t entry, const char *key,
+				    char *buffer, size_t buflen, size_t *pn));
 
 /* Helper function saving in buffer, the argument of "compose" field.  */
-int mu_mailcap_entry_get_compose (mu_mailcap_entry_t entry, char *buffer, size_t buflen, size_t *pn);
+int mu_mailcap_entry_get_compose __P((mu_mailcap_entry_t entry, char *buffer,
+				      size_t buflen, size_t *pn));
 
 /* Helper function saving in buffer, the argument of "composetyped" field.  */
-int mu_mailcap_entry_get_composetyped (mu_mailcap_entry_t entry, char *buffer, size_t buflen, size_t *pn);
+int mu_mailcap_entry_get_composetyped __P((mu_mailcap_entry_t entry,
+					   char *buffer, size_t buflen,
+					   size_t *pn));
 
 /* Helper function saving in buffer, the argument of "edit" field.  */
-int mu_mailcap_entry_get_edit (mu_mailcap_entry_t entry, char *buffer, size_t buflen, size_t *pn);
+int mu_mailcap_entry_get_edit __P((mu_mailcap_entry_t entry, char *buffer,
+				   size_t buflen, size_t *pn));
 
 /* Helper function saving in buffer, the argument of "textualnewlines" field.  */
-int mu_mailcap_entry_get_textualnewlines (mu_mailcap_entry_t entry, char *buffer, size_t buflen, size_t *pn);
+int mu_mailcap_entry_get_textualnewlines __P((mu_mailcap_entry_t entry,
+					      char *buffer, size_t buflen,
+					      size_t *pn));
 
 /* Helper function saving in buffer, the argument of "test" field.  */
-int mu_mailcap_entry_get_test (mu_mailcap_entry_t entry, char *buffer, size_t buflen, size_t *pn);
+int mu_mailcap_entry_get_test __P((mu_mailcap_entry_t entry,
+				   char *buffer, size_t buflen, size_t *pn));
 
 /* Helper function saving in buffer, the argument of "x11-bitmap" field.  */
-int mu_mailcap_entry_get_x11bitmap (mu_mailcap_entry_t entry, char *buffer, size_t buflen, size_t *pn);
+int mu_mailcap_entry_get_x11bitmap __P((mu_mailcap_entry_t entry,
+					char *buffer, size_t buflen, size_t *pn));
 
 /* Helper function saving in buffer, the argument of "description" field.  */
-int mu_mailcap_entry_get_description (mu_mailcap_entry_t entry, char *buffer, size_t buflen, size_t *pn);
+int mu_mailcap_entry_get_description __P((mu_mailcap_entry_t entry,
+					  char *buffer, size_t buflen,
+					  size_t *pn));
 
 /* Helper function saving in buffer, the argument of "nametemplate" field.  */
-int mu_mailcap_entry_get_nametemplate (mu_mailcap_entry_t entry, char *buffer, size_t buflen, size_t *pn);
+int mu_mailcap_entry_get_nametemplate __P((mu_mailcap_entry_t entry,
+					   char *buffer, size_t buflen,
+					   size_t *pn));
 
 /* Helper function saving in buffer, the argument of "notes" field.  */
-int mu_mailcap_entry_get_notes (mu_mailcap_entry_t entry, char *buffer, size_t buflen, size_t *pn);
+int mu_mailcap_entry_get_notes __P((mu_mailcap_entry_t entry, char *buffer,
+				    size_t buflen, size_t *pn));
 
-/* Helper function  return *on != 0 if the flag "needsterminal" is in the record.  */
-int mu_mailcap_entry_needsterminal (mu_mailcap_entry_t entry, int *on);
+/* Helper function. Returns *on != 0 if the flag "needsterminal" is in the
+   record.  */
+int mu_mailcap_entry_needsterminal __P((mu_mailcap_entry_t entry, int *on));
 
-/* Helper function  return *on != 0 if the flag "copiousoutput" is in the record.  */
-int mu_mailcap_entry_copiousoutput (mu_mailcap_entry_t entry, int *on);
+/* Helper function. Returns *on != 0 if the flag "copiousoutput" is in the
+   record.  */
+int mu_mailcap_entry_copiousoutput __P((mu_mailcap_entry_t entry, int *on));
 
+#ifdef __cplusplus
+}
+#endif
+  
 #endif