projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i18n: Introduce C_ENCODING as replacement for LEGACY_NATIVE.
[pspp-builds.git]
/
src
/
language
/
lexer
/
value-parser.c
diff --git
a/src/language/lexer/value-parser.c
b/src/language/lexer/value-parser.c
index 4ef092de3a3e6c884e3c236e2d159b19023eed01..649bbf2498c248c57afc17a55edda014ab296e8f 100644
(file)
--- a/
src/language/lexer/value-parser.c
+++ b/
src/language/lexer/value-parser.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2006, 2009, 2010
, 2011
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-25,6
+25,7
@@
#include "data/value.h"
#include "language/lexer/lexer.h"
#include "libpspp/cast.h"
#include "data/value.h"
#include "language/lexer/lexer.h"
#include "libpspp/cast.h"
+#include "libpspp/i18n.h"
#include "libpspp/message.h"
#include "libpspp/str.h"
#include "libpspp/message.h"
#include "libpspp/str.h"
@@
-106,8
+107,7
@@
parse_number (struct lexer *lexer, double *x, const enum fmt_type *format)
assert (fmt_get_category (*format) != FMT_CAT_STRING);
assert (fmt_get_category (*format) != FMT_CAT_STRING);
- if (!data_in_msg (lex_tokss (lexer), LEGACY_NATIVE,
- *format, &v, 0, NULL))
+ if (!data_in_msg (lex_tokss (lexer), C_ENCODING, *format, &v, 0, NULL))
return false;
lex_get (lexer);
return false;
lex_get (lexer);
@@
-143,12
+143,7
@@
parse_value (struct lexer *lexer, union value *v, int width)
}
else if (lex_force_string (lexer))
{
}
else if (lex_force_string (lexer))
{
- const char *s;
-
- if (!lex_force_string (lexer))
- return false;
-
- s = lex_tokcstr (lexer);
+ const char *s = lex_tokcstr (lexer);
value_copy_str_rpad (v, width, CHAR_CAST_BUG (const uint8_t *, s), ' ');
}
else
value_copy_str_rpad (v, width, CHAR_CAST_BUG (const uint8_t *, s), ' ');
}
else