[PATCH 4/8] mbsstr: port --enable-gcc-warnings to clang

[Paul Eggert]

* lib/mbsstr.c (knuth_morris_pratt_multibyte):
Avoid casts from looser to stricter-aligned pointers.
---
 ChangeLog    | 4 ++++
 lib/mbsstr.c | 7 ++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 508458e..1a8925a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2013-05-15  Paul Eggert  <address@hidden>
 
+       mbsstr: port --enable-gcc-warnings to clang
+       * lib/mbsstr.c (knuth_morris_pratt_multibyte):
+       Avoid casts from looser to stricter-aligned pointers.
+
        malloca: port --enable-gcc-warnings to clang
        * lib/malloca.c (struct header): New member 'magic', to avoid casts.
        (mmalloca): Avoid casts from looser to stricter-aligned pointers.
diff --git a/lib/mbsstr.c b/lib/mbsstr.c
index f84e689..24cff25 100644
--- a/lib/mbsstr.c
+++ b/lib/mbsstr.c
@@ -45,11 +45,12 @@ knuth_morris_pratt_multibyte (const char *haystack, const 
char *needle,
   size_t *table;
 
   /* Allocate room for needle_mbchars and the table.  */
-  char *memory = (char *) nmalloca (m, sizeof (mbchar_t) + sizeof (size_t));
+  void *memory = nmalloca (m, sizeof (mbchar_t) + sizeof (size_t));
+  void *table_memory;
   if (memory == NULL)
     return false;
-  needle_mbchars = (mbchar_t *) memory;
-  table = (size_t *) (memory + m * sizeof (mbchar_t));
+  needle_mbchars = memory;
+  table = table_memory = needle_mbchars + m;
 
   /* Fill needle_mbchars.  */
   {
-- 
1.7.11.7