projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/master' into import-gui
[pspp]
/
src
/
language
/
stats
/
autorecode.c
diff --git
a/src/language/stats/autorecode.c
b/src/language/stats/autorecode.c
index 95fb8d173c5661f3a79e06b948457510a8d9e0da..b2c4d4844c5c6cd083b54f0055d5a204c72baa7c 100644
(file)
--- a/
src/language/stats/autorecode.c
+++ b/
src/language/stats/autorecode.c
@@
-37,9
+37,10
@@
#include "libpspp/str.h"
#include "gl/xalloc.h"
#include "libpspp/str.h"
#include "gl/xalloc.h"
-#include "gl/
vasn
printf.h"
+#include "gl/
c-xvas
printf.h"
#include "gl/mbiter.h"
#include "gl/mbiter.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-295,7
+296,6
@@
cmd_autorecode (struct lexer *lexer, struct dataset *ds)
for (j = 0; j < n_items; j++)
{
const union value *from = &items[j]->from;
for (j = 0; j < n_items; j++)
{
const union value *from = &items[j]->from;
- size_t len;
char *recoded_value = NULL;
char *c;
const int src_width = items[j]->width;
char *recoded_value = NULL;
char *c;
const int src_width = items[j]->width;
@@
-315,7
+315,7
@@
cmd_autorecode (struct lexer *lexer, struct dataset *ds)
recoded_value = recode_string (UTF8, dict_get_encoding (arc->dict), str, src_width);
}
else
recoded_value = recode_string (UTF8, dict_get_encoding (arc->dict), str, src_width);
}
else
- recoded_value =
asnprintf (NULL, &len,
"%g", from->f);
+ recoded_value =
c_xasprintf (
"%g", from->f);
/* Remove trailing whitespace */
for (c = recoded_value; *c != '\0'; c++)
/* Remove trailing whitespace */
for (c = recoded_value; *c != '\0'; c++)