projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added initial innovations functions
[pspp-builds.git]
/
src
/
language
/
dictionary
/
value-labels.c
diff --git
a/src/language/dictionary/value-labels.c
b/src/language/dictionary/value-labels.c
index 8479fe7fa74218feeb0c462aed2e86fa1c5df692..dec757c356de18ade4bbad808abd7d2e38ed1db8 100644
(file)
--- a/
src/language/dictionary/value-labels.c
+++ b/
src/language/dictionary/value-labels.c
@@
-18,16
+18,19
@@
02110-1301, USA. */
#include <config.h>
02110-1301, USA. */
#include <config.h>
+
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
-#include <libpspp/alloc.h>
+
+#include <data/procedure.h>
+#include <data/value-labels.h>
+#include <data/variable.h>
#include <language/command.h>
#include <language/command.h>
-#include <libpspp/message.h>
-#include <libpspp/hash.h>
#include <language/lexer/lexer.h>
#include <language/lexer/lexer.h>
+#include <libpspp/alloc.h>
+#include <libpspp/hash.h>
+#include <libpspp/message.h>
#include <libpspp/str.h>
#include <libpspp/str.h>
-#include <data/value-labels.h>
-#include <data/variable.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-154,7
+157,7
@@
get_label (struct variable **vars, size_t var_cnt)
lex_error (_("expecting string"));
return 0;
}
lex_error (_("expecting string"));
return 0;
}
- buf_copy_str_rpad (value.s, MAX_SHORT_STRING, ds_c
_
str (&tokstr));
+ buf_copy_str_rpad (value.s, MAX_SHORT_STRING, ds_cstr (&tokstr));
}
else
{
}
else
{
@@
-177,7
+180,7
@@
get_label (struct variable **vars, size_t var_cnt)
msg (SW, _("Truncating value label to 60 characters."));
ds_truncate (&tokstr, 60);
}
msg (SW, _("Truncating value label to 60 characters."));
ds_truncate (&tokstr, 60);
}
- label = ds_c
_
str (&tokstr);
+ label = ds_cstr (&tokstr);
for (i = 0; i < var_cnt; i++)
val_labs_replace (vars[i]->val_labs, value, label);
for (i = 0; i < var_cnt; i++)
val_labs_replace (vars[i]->val_labs, value, label);