test/getcwidth.c: Allow for 8-bit and 16-bit wchar_t.

[nmh] / h / prototypes.h

diff --git a/h/prototypes.h b/h/prototypes.h
index 9a2b41a426bb6a5dcf46e2418f35f6160b677134..64bd847b6fd7fc74ae6972186c100ca3eced444c 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -16,11 +16,11 @@ char *etcpath(char *);
 struct msgs_array;
 
 void add_profile_entry (const char *, const char *);
 struct msgs_array;
 
 void add_profile_entry (const char *, const char *);

-void inform(char *fmt, ...);
-void adios (const char *, const char *, ...) NORETURN;
-void admonish (char *, char *, ...);
-void advertise (const char *, char *, const char *, va_list);
-void advise (const char *, const char *, ...);
+void inform(char *fmt, ...) CHECK_PRINTF(1, 2);
+void adios (const char *, const char *, ...) CHECK_PRINTF(2, 3) NORETURN;
+void admonish (char *, char *, ...) CHECK_PRINTF(2, 3);
+void advertise (const char *, char *, const char *, va_list) CHECK_PRINTF(3, 0);
+void advise (const char *, const char *, ...) CHECK_PRINTF(2, 3);

 char **argsplit (char *, char **, int *);
 void argsplit_msgarg (struct msgs_array *, char *, char **);
 void argsplit_insert (struct msgs_array *, char *, char **);
 char **argsplit (char *, char **, int *);
 void argsplit_msgarg (struct msgs_array *, char *, char **);
 void argsplit_insert (struct msgs_array *, char *, char **);


@@ -345,22 +345,6 @@ int ssequal (const char *, const char *);
 int stringdex (char *, char *);
 char *trimcpy (char *);
 
 int stringdex (char *, char *);
 char *trimcpy (char *);
 

-/*
- * Remove quotes and quoted-pair sequences from RFC-5322 atoms.
- *
- * Currently the actual algorithm is simpler than it technically should
- * be: any quotes are simply eaten, unless they're preceded by the escape
- * character (\).  This seems to be sufficient for our needs for now.
- *
- * Arguments:
- *
- * input       - The input string
- * output      - The output string; is assumed to have at least as much
- *               room as the input string.  At worst the output string will
- *               be the same size as the input string; it might be smaller.
- *
- */
-void unquote_string(const char *input, char *output);

 int uprf (const char *, const char *);
 int vfgets (FILE *, char **);
 
 int uprf (const char *, const char *);
 int vfgets (FILE *, char **);