projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reform string library.
[pspp-builds.git]
/
src
/
language
/
expressions
/
helpers.c
diff --git
a/src/language/expressions/helpers.c
b/src/language/expressions/helpers.c
index 4dd3cf3de7c2d7cb29eaa2df9625e5b0ebaa4b9b..fd78e734abe0eefde8c2206af5a2149faaf8dba3 100644
(file)
--- a/
src/language/expressions/helpers.c
+++ b/
src/language/expressions/helpers.c
@@
-5,7
+5,7
@@
#include <libpspp/pool.h>
#include "private.h"
#include <libpspp/pool.h>
#include "private.h"
-const struct
fixed_
string empty_string = {NULL, 0};
+const struct
sub
string empty_string = {NULL, 0};
static void
expr_error (void *aux UNUSED, const char *format, ...)
static void
expr_error (void *aux UNUSED, const char *format, ...)
@@
-121,7
+121,7
@@
expr_yrmoda (double year, double month, double day)
}
int
}
int
-compare_string (const struct
fixed_string *a, const struct fixed_
string *b)
+compare_string (const struct
substring *a, const struct sub
string *b)
{
size_t i;
{
size_t i;
@@
-149,19
+149,19
@@
count_valid (double *d, size_t d_cnt)
return valid_cnt;
}
return valid_cnt;
}
-struct
fixed_
string
+struct
sub
string
alloc_string (struct expression *e, size_t length)
{
alloc_string (struct expression *e, size_t length)
{
- struct
fixed_
string s;
+ struct
sub
string s;
s.length = length;
s.string = pool_alloc (e->eval_pool, length);
return s;
}
s.length = length;
s.string = pool_alloc (e->eval_pool, length);
return s;
}
-struct
fixed_
string
+struct
sub
string
copy_string (struct expression *e, const char *old, size_t length)
{
copy_string (struct expression *e, const char *old, size_t length)
{
- struct
fixed_
string s = alloc_string (e, length);
+ struct
sub
string s = alloc_string (e, length);
memcpy (s.string, old, length);
return s;
}
memcpy (s.string, old, length);
return s;
}