zip-reader: Fix memory leak on error path in zip_reader_create().

[pspp] / src / libpspp / i18n.h

diff --git a/src/libpspp/i18n.h b/src/libpspp/i18n.h
index 27ccce361e5ccfa8a6bf03c85967e96eaf4174ae..d128fcea1a68015eeda204c07056ec0accf36b97 100644 (file)
--- a/src/libpspp/i18n.h
+++ b/src/libpspp/i18n.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2006, 2010, 2011, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2010, 2011, 2012, 2014, 2016 Free Software Foundation, Inc.
 
    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
@@ -17,6 +17,7 @@
 #ifndef I18N_H
 #define I18N_H
 
+#include "libpspp/compiler.h"
 #include <stdbool.h>
 #include <unistr.h>
 
@@ -40,6 +41,9 @@ char *recode_string_pool (const char *to, const char *from,
                          const char *text, int length, struct pool *);
 struct substring recode_substring_pool (const char *to, const char *from,
                                         struct substring text, struct pool *);
+int recode_pedantically (const char *to, const char *from,
+                         struct substring text, struct pool *,
+                         struct substring *out);
 
 size_t recode_string_len (const char *to, const char *from,
                           const char *text, int len);
@@ -67,6 +71,14 @@ void set_default_encoding (const char *enc);
 bool set_encoding_from_locale (const char *loc);
 
 const char *uc_name (ucs4_t uc, char buffer[16]);
+
+unsigned int utf8_hash_case_bytes (const char *, size_t n, unsigned int basis) WARN_UNUSED_RESULT;
+unsigned int utf8_hash_case_string (const char *, unsigned int basis) WARN_UNUSED_RESULT;
+int utf8_strcasecmp (const char *, const char *);
+int utf8_strncasecmp (const char *, size_t, const char *, size_t);
+int utf8_strverscasecmp (const char *, const char *);
+char *utf8_to_upper (const char *);
+char *utf8_to_lower (const char *);
 \f
 /* Information about character encodings. */
 
@@ -134,6 +146,7 @@ struct encoding_info
     int unit;                   /* Unit width, in bytes. */
     char cr[MAX_UNIT];          /* \r in encoding, 'unit' bytes long. */
     char lf[MAX_UNIT];          /* \n in encoding, 'unit' bytes long. */
+    char space[MAX_UNIT];       /* ' ' in encoding, 'unit' bytes long. */
   };
 
 bool get_encoding_info (struct encoding_info *, const char *name);
@@ -141,4 +154,18 @@ bool is_encoding_ascii_compatible (const char *encoding);
 bool is_encoding_ebcdic_compatible (const char *encoding);
 bool is_encoding_supported (const char *encoding);
 
+bool is_encoding_utf8 (const char *encoding);
+\f
+/* Database of encodings, by language or region. */
+
+struct encoding_category
+  {
+    const char *category;       /* e.g. "Arabic" or "Western European". */
+    const char **encodings;     /* Encodings within the category. */
+    size_t n_encodings;         /* Number of encodings in category. */
+  };
+
+struct encoding_category *get_encoding_categories (void);
+size_t get_n_encoding_categories (void);
+
 #endif /* i18n.h */