type: Make an assert()ion independent of the last entry of an enum.

[cparser] / string_rep.h

diff --git a/string_rep.h b/string_rep.h
index fd6c00b..b7d8eb4 100644 (file)
--- a/string_rep.h
+++ b/string_rep.h
@@ -1,21 +1,6 @@
 /*
  * This file is part of cparser.
- * Copyright (C) 2007-2009 Matthias Braun <matze@braunis.de>
- *
- * 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 the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Copyright (C) 2012 Matthias Braun <matze@braunis.de>
  */
 #ifndef STRING_REP_H
 #define STRING_REP_H
@@ -25,16 +10,19 @@
 
 enum string_encoding_t {
        STRING_ENCODING_CHAR,
+       STRING_ENCODING_CHAR16,
+       STRING_ENCODING_CHAR32,
+       STRING_ENCODING_UTF8,
        STRING_ENCODING_WIDE
 };
 typedef enum string_encoding_t string_encoding_t;
 
 typedef struct string_t {
-       const char *begin; /**< UTF-8 encoded string, the last character is
-                                               * guaranteed to be 0 */
-       size_t      size;  /**< size of string in bytes (not characters) */
+       char const       *begin; /**< UTF-8 encoded string, the last character is guaranteed to be \0. */
+       size_t            size;  /**< size of string in bytes (not characters), without terminating \0. */
+       string_encoding_t encoding;
 } string_t;
 
-size_t get_string_len(string_encoding_t enc, string_t const *str);
+size_t get_string_len(string_t const *str);
 
 #endif