diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-10-01 19:08:30 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-10-01 19:08:30 +0000 |
| commit | d77cd295eb5bde456868eb5d7c71042edaa88151 (patch) | |
| tree | 009cdfc6bae0fc762f5ac9da7c81dc04f3f599e5 /posix | |
| parent | 4a9dcff10ec07770aaf0b4dedaac44eacbbaa110 (diff) | |
Update.
* Makefile (repertoiremaps): Remove variable.
(distribute): Remove repertoiremaps.
(install-others): Likewise. Add .gz to charmaps.
($(inst_i18ndir)/charmaps/%): Install in gzipped format.
2000-09-30 Bruno Haible <haible@clisp.cons.org>
Diffstat (limited to 'posix')
| -rw-r--r-- | posix/spawn_faction_addclose.c | 4 | ||||
| -rw-r--r-- | posix/spawn_faction_adddup2.c | 4 | ||||
| -rw-r--r-- | posix/spawn_faction_addopen.c | 4 | ||||
| -rw-r--r-- | posix/spawn_faction_init.c | 13 |
4 files changed, 13 insertions, 12 deletions
diff --git a/posix/spawn_faction_addclose.c b/posix/spawn_faction_addclose.c index b093f2812a..af3b43045d 100644 --- a/posix/spawn_faction_addclose.c +++ b/posix/spawn_faction_addclose.c @@ -35,10 +35,10 @@ posix_spawn_file_actions_addclose (posix_spawn_file_actions_t *file_actions, if (fd < 0 || fd >= maxfd) return EBADF; - /* Allocate more memory of needed. */ + /* Allocate more memory if needed. */ if (file_actions->__used == file_actions->__allocated && __posix_spawn_file_actions_realloc (file_actions) != 0) - /* THis can only mean we ran out of memory. */ + /* This can only mean we ran out of memory. */ return ENOMEM; /* Add the new value. */ diff --git a/posix/spawn_faction_adddup2.c b/posix/spawn_faction_adddup2.c index f8de8ca7f6..46dd5ed129 100644 --- a/posix/spawn_faction_adddup2.c +++ b/posix/spawn_faction_adddup2.c @@ -35,10 +35,10 @@ posix_spawn_file_actions_adddup2 (posix_spawn_file_actions_t *file_actions, if (fd < 0 || newfd < 0 || fd >= maxfd || newfd >= maxfd) return EBADF; - /* Allocate more memory of needed. */ + /* Allocate more memory if needed. */ if (file_actions->__used == file_actions->__allocated && __posix_spawn_file_actions_realloc (file_actions) != 0) - /* THis can only mean we ran out of memory. */ + /* This can only mean we ran out of memory. */ return ENOMEM; /* Add the new value. */ diff --git a/posix/spawn_faction_addopen.c b/posix/spawn_faction_addopen.c index 3e0c62659e..f438ec1c1e 100644 --- a/posix/spawn_faction_addopen.c +++ b/posix/spawn_faction_addopen.c @@ -36,10 +36,10 @@ posix_spawn_file_actions_addopen (posix_spawn_file_actions_t *file_actions, if (fd < 0 || fd >= maxfd) return EBADF; - /* Allocate more memory of needed. */ + /* Allocate more memory if needed. */ if (file_actions->__used == file_actions->__allocated && __posix_spawn_file_actions_realloc (file_actions) != 0) - /* THis can only mean we ran out of memory. */ + /* This can only mean we ran out of memory. */ return ENOMEM; /* Add the new value. */ diff --git a/posix/spawn_faction_init.c b/posix/spawn_faction_init.c index edd41ddd6f..f4b0775b0b 100644 --- a/posix/spawn_faction_init.c +++ b/posix/spawn_faction_init.c @@ -21,23 +21,24 @@ #include <stdlib.h> #include <string.h> +#include "spawn_int.h" + /* Function used to increase the size of the allocated array. This function is called from the `add'-functions. */ int __posix_spawn_file_actions_realloc (posix_spawn_file_actions_t *file_actions) { + int newalloc = file_actions->__allocated + 8; void *newmem = realloc (file_actions->__actions, - file_actions->__allocated += 8); + newalloc * sizeof (struct __spawn_action)); if (newmem == NULL) - { - /* Not enough memory. */ - file_actions->__allocated -= 8; - return ENOMEM; - } + /* Not enough memory. */ + return ENOMEM; file_actions->__actions = (struct __spawn_action *) newmem; + file_actions->__allocated = newalloc; return 0; } |