Minor portability improvements.

[cdecl99.git] / src / error.c

diff --git a/src/error.c b/src/error.c
index 9b89bac15239c04b0cec366e05af44b103ec8e0d..093f56c5c58e134800998fce8ad05c3e28dfabe3 100644 (file)
--- a/src/error.c
+++ b/src/error.c
@@ -20,6 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
+
 #include <glthread/lock.h>
 #include <glthread/tls.h>
 
@@ -32,7 +33,7 @@ static gl_tls_key_t tls_key;
 struct err_state {
        struct cdecl_error err;
        size_t nstr;
-       char str[];
+       char str[FLEXIBLE_ARRAY_MEMBER];
 };
 
 /* This error is reserved for extremely dire out-of-memory conditions. */
@@ -45,12 +46,14 @@ static struct err_state err_no_mem = {
 
 const char *cdecl__strerror(unsigned code)
 {
-#      include "errtab.h"
+#include "errtab.h"
 
-       assert(code < sizeof offtab / sizeof offtab[0]);
-       assert(offtab[code] != 0);
+       switch (code) {
+       case CDECL_ENOMEM: return gettext(strtab+err_enomem);
+       case CDECL_ENOPARSE: return gettext(strtab+err_enoparse);
+       }
 
-       return gettext((char *)&strtab + offtab[code]);
+       assert(0);
 }
 
 static void free_err(void *err)