projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mgetgroups: reduce duplicate listings
[gnulib.git]
/
lib
/
memxfrm.c
diff --git
a/lib/memxfrm.c
b/lib/memxfrm.c
index
9b29c52
..
dc6eda1
100644
(file)
--- a/
lib/memxfrm.c
+++ b/
lib/memxfrm.c
@@
-25,7
+25,7
@@
#include <string.h>
char *
#include <string.h>
char *
-memxfrm (char *s, size_t n, size_t *lengthp)
+memxfrm (char *s, size_t n,
char *resultbuf,
size_t *lengthp)
{
/* Result accumulator. */
char *result;
{
/* Result accumulator. */
char *result;
@@
-35,10
+35,18
@@
memxfrm (char *s, size_t n, size_t *lengthp)
char orig_sentinel;
/* Initial memory allocation. */
char orig_sentinel;
/* Initial memory allocation. */
- allocated = (n > 0 ? n : 1);
- result = (char *) malloc (allocated);
- if (result == NULL)
- goto out_of_memory_2;
+ if (resultbuf != NULL && *lengthp > 0)
+ {
+ result = resultbuf;
+ allocated = *lengthp;
+ }
+ else
+ {
+ allocated = (n > 0 ? n : 1);
+ result = (char *) malloc (allocated);
+ if (result == NULL)
+ goto out_of_memory_2;
+ }
length = 0;
/* Add sentinel.byte. */
length = 0;
/* Add sentinel.byte. */
@@
-72,7
+80,12
@@
memxfrm (char *s, size_t n, size_t *lengthp)
char *new_result;
allocated = 2 * allocated;
char *new_result;
allocated = 2 * allocated;
- new_result = (char *) realloc (result, allocated);
+ if (allocated < 64)
+ allocated = 64;
+ if (result == resultbuf)
+ new_result = (char *) malloc (allocated);
+ else
+ new_result = (char *) realloc (result, allocated);
if (new_result == NULL)
goto out_of_memory_1;
result = new_result;
if (new_result == NULL)
goto out_of_memory_1;
result = new_result;
@@
-93,7
+106,7
@@
memxfrm (char *s, size_t n, size_t *lengthp)
}
/* Shrink the allocated memory if possible. */
}
/* Shrink the allocated memory if possible. */
- if ((length > 0 ? length : 1) < allocated)
+ if (
result != resultbuf &&
(length > 0 ? length : 1) < allocated)
{
char *memory = (char *) realloc (result, length > 0 ? length : 1);
if (memory != NULL)
{
char *memory = (char *) realloc (result, length > 0 ? length : 1);
if (memory != NULL)
@@
-107,14
+120,16
@@
memxfrm (char *s, size_t n, size_t *lengthp)
fail:
{
int saved_errno = errno;
fail:
{
int saved_errno = errno;
- free (result);
+ if (result != resultbuf)
+ free (result);
s[n] = orig_sentinel;
errno = saved_errno;
return NULL;
}
out_of_memory_1:
s[n] = orig_sentinel;
errno = saved_errno;
return NULL;
}
out_of_memory_1:
- free (result);
+ if (result != resultbuf)
+ free (result);
s[n] = orig_sentinel;
out_of_memory_2:
errno = ENOMEM;
s[n] = orig_sentinel;
out_of_memory_2:
errno = ENOMEM;