projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed memory leaks resulting from fn_interp_vars et. al.
[pspp-builds.git]
/
src
/
libpspp
/
str.h
diff --git
a/src/libpspp/str.h
b/src/libpspp/str.h
index 7773db022ca69fb54cb0a9a53c3e739330794604..c0643263d36b85075616620a3d2a0662a4e4f4f4 100644
(file)
--- a/
src/libpspp/str.h
+++ b/
src/libpspp/str.h
@@
-20,6
+20,7
@@
#if !str_h
#define str_h 1
#if !str_h
#define str_h 1
+#include <assert.h>
#include <stdarg.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdarg.h>
#include <stdbool.h>
#include <stdio.h>
@@
-128,6
+129,8
@@
void ds_shrink (struct string *);
void ds_truncate (struct string *, size_t);
void ds_rpad (struct string *, size_t length, char pad);
int ds_rtrim_spaces (struct string *);
void ds_truncate (struct string *, size_t);
void ds_rpad (struct string *, size_t length, char pad);
int ds_rtrim_spaces (struct string *);
+int ds_ltrim_spaces (struct string *st);
+
bool ds_chomp (struct string *, char);
/* Inspectors. */
bool ds_chomp (struct string *, char);
/* Inspectors. */
@@
-171,6
+174,7
@@
ds_length (const struct string *st)
extern inline char *
ds_c_str (const struct string *st)
{
extern inline char *
ds_c_str (const struct string *st)
{
+ assert(st);
((char *) st->string)[st->length] = '\0';
return st->string;
}
((char *) st->string)[st->length] = '\0';
return st->string;
}
@@
-206,4
+210,12
@@
spprintf (char *dst, const char *format, ...)
return dst + count;
}
return dst + count;
}
+int ds_find(const struct string *st, const char cs[]);
+
+int ds_n_find(const struct string *st, const char cs[]);
+
+void ds_create_substr(struct string *dst, const struct string *src,
+ int first, int last);
+
+
#endif /* str_h */
#endif /* str_h */