projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get rid of capacity argument to ds_init() and update all callers.
[pspp-builds.git]
/
src
/
libpspp
/
str.c
diff --git
a/src/libpspp/str.c
b/src/libpspp/str.c
index 70edaeede16c0ac5bdf871d620b690cbd7118d59..ef2be7d068479ee023b484386a9d53d537d30407 100644
(file)
--- a/
src/libpspp/str.c
+++ b/
src/libpspp/str.c
@@
-247,13
+247,13
@@
ds_create (struct string *st, const char *s)
strcpy (st->string, s);
}
strcpy (st->string, s);
}
-/* Initializes ST
, making room for at least CAPACITY characters
. */
+/* Initializes ST
as an empty string
. */
void
void
-ds_init (struct string *st
, size_t capacity
)
+ds_init (struct string *st)
{
st->length = 0;
{
st->length = 0;
- st->capacity =
MAX (8, capacity)
;
- st->string =
xmalloc (st->capacity + 1)
;
+ st->capacity =
0
;
+ st->string =
NULL
;
}
/* Frees ST. */
}
/* Frees ST. */
@@
-285,7
+285,7
@@
ds_init_substring (struct string *dst,
const struct string *src, size_t idx, size_t cnt)
{
assert (dst != src);
const struct string *src, size_t idx, size_t cnt)
{
assert (dst != src);
- ds_init (dst
, cnt
);
+ ds_init (dst);
ds_assign_substring (dst, src, idx, cnt);
}
ds_assign_substring (dst, src, idx, cnt);
}