X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/460b9539a7c15580e41a71bbc0f47ae776238915..cca956b199841d754e8a78391d2e2c7efce4a3ee:/lib/charset.h

diff --git a/lib/charset.h b/lib/charset.h
index 3dcd756..db5e737 100644
--- a/lib/charset.h
+++ b/lib/charset.h
@@ -1,6 +1,7 @@
+
 /*
  * This file is part of DisOrder.
- * Copyright (C) 2004, 2005 Richard Kettlewell
+ * Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,10 +21,12 @@
 #ifndef CHARSET_H
 #define CHARSET_H
 
+#include "log.h"
+
+struct dynstr;
+
 /* Character encoding conversion routines */
 
-uint32_t *utf82ucs4(const char *mb);
-char *ucs42utf8(const uint32_t *u);
 char *mb2utf8(const char *mb);
 char *utf82mb(const char *utf8);
 /* various conversions, between multibyte strings (mb) in
@@ -48,14 +51,18 @@ char *any2any(const char *from/*encoding or 0*/,
  * that iconv knows.  If FROM and TO are both 0 then ANY is returned
  * unchanged. */
 
-
+/** @brief Insist that @p s is not null
+ * @param s Pointer to check
+ * @return @p s
+ *
+ * Terminates the process if @p s is a null pointer.
+ */
 static inline char *nullcheck(char *s) {
   if(!s) exitfn(1);			/* assume an error already reported */
   return s;
 }
 
-int ucs4cmp(const uint32_t *a, const uint32_t *b);
-/* like strcmp */
+const char *truncate_for_display(const char *s, long max);
 
 #endif /* CHARSET_H */
 
@@ -65,4 +72,3 @@ c-basic-offset:2
 comment-column:40
 End:
 */
-/* arch-tag:ca7783e592109d7b7078175bd301faf7 */