projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NEWS.stable: log cherry-pick [e446f25]->[c092018] relocatable-shell: Update suggested...
[gnulib.git]
/
lib
/
mbsstr.c
diff --git
a/lib/mbsstr.c
b/lib/mbsstr.c
index
f84e689
..
a3ac200
100644
(file)
--- a/
lib/mbsstr.c
+++ b/
lib/mbsstr.c
@@
-1,5
+1,5
@@
/* Searching in a string.
/* Searching in a string.
- Copyright (C) 2005-201
3
Free Software Foundation, Inc.
+ Copyright (C) 2005-201
4
Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2005.
This program is free software: you can redistribute it and/or modify
Written by Bruno Haible <bruno@clisp.org>, 2005.
This program is free software: you can redistribute it and/or modify
@@
-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. */
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;
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. */
{
/* Fill needle_mbchars. */
{