From: Paul Eggert Date: Sat, 12 Jun 2021 00:18:57 +0000 (-0700) Subject: ialloc: new module X-Git-Tag: v1.0~2829 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=f1698a709865b6fea53f1c417c8cb1db5dec4adc;p=gnulib.git ialloc: new module * lib/ialloc.c, lib/ialloc.h, modules/ialloc: New files. --- diff --git a/ChangeLog b/ChangeLog index 304599f810..dd9aa50157 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2021-06-11 Paul Eggert + ialloc: new module + * lib/ialloc.c, lib/ialloc.h, modules/ialloc: New files. + exclude: improve wide-character hashing * lib/exclude.c (string_hasher_ci): Take the modulo at the end rather than each time a wide character is retrieved; this should diff --git a/lib/ialloc.c b/lib/ialloc.c new file mode 100644 index 0000000000..9eff290357 --- /dev/null +++ b/lib/ialloc.c @@ -0,0 +1,3 @@ +#include +#define IALLOC_INLINE _GL_EXTERN_INLINE +#include "ialloc.h" diff --git a/lib/ialloc.h b/lib/ialloc.h new file mode 100644 index 0000000000..e243c928c0 --- /dev/null +++ b/lib/ialloc.h @@ -0,0 +1,94 @@ +/* ialloc.h -- malloc with idx_t rather than size_t + + Copyright 2021 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 + the Free Software Foundation; either version 3 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, see . */ + +#ifndef IALLOC_H_ +#define IALLOC_H_ + +#include "idx.h" + +#include +#include +#include + +#ifndef _GL_INLINE_HEADER_BEGIN + #error "Please include config.h first." +#endif +_GL_INLINE_HEADER_BEGIN +#ifndef IALLOC_INLINE +# define IALLOC_INLINE _GL_INLINE +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +IALLOC_INLINE void * _GL_ATTRIBUTE_COLD +_gl_alloc_nomem (void) +{ + errno = ENOMEM; + return NULL; +} + +IALLOC_INLINE void * +imalloc (idx_t s) +{ + return s <= SIZE_MAX ? malloc (s) : _gl_alloc_nomem (); +} + +IALLOC_INLINE void * +irealloc (void *p, idx_t s) +{ + /* Work around GNU realloc glitch by treating a zero size as if it + were 1, so that returning NULL is equivalent to failing. */ + return s <= SIZE_MAX ? realloc (p, s | !s) : _gl_alloc_nomem (); +} + +IALLOC_INLINE void * +icalloc (idx_t n, idx_t s) +{ + if (SIZE_MAX < n) + { + if (s != 0) + return _gl_alloc_nomem (); + n = 0; + } + if (SIZE_MAX < s) + { + if (n != 0) + return _gl_alloc_nomem (); + s = 0; + } + return calloc (n, s); +} + +IALLOC_INLINE void * +ireallocarray (void *p, idx_t n, idx_t s) +{ + /* Work around GNU reallocarray glitch by treating a zero size as if + it were 1, so that returning NULL is equivalent to failing. */ + if (n == 0 || s == 0) + n = s = 1; + return (n <= SIZE_MAX && s <= SIZE_MAX + ? reallocarray (p, n, s) + : _gl_alloc_nomem ()); +} + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/modules/ialloc b/modules/ialloc new file mode 100644 index 0000000000..3bf377a62e --- /dev/null +++ b/modules/ialloc @@ -0,0 +1,29 @@ +Description: +Memory allocation using idx_t instead of size_t + +Files: +lib/ialloc.c +lib/ialloc.h + +Depends-on: +calloc-gnu +extern-inline +idx +malloc-gnu +realloc-gnu +reallocarray +stdint + +configure.ac: + +Makefile.am: +lib_SOURCES += ialloc.c + +Include: +"ialloc.h" + +License: +LGPL + +Maintainer: +all