projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add zlib, libxml2 to optional library dependencies.
[pspp]
/
src
/
language
/
lexer
/
lexer.c
diff --git
a/src/language/lexer/lexer.c
b/src/language/lexer/lexer.c
index fb0ddb49679afb087bab9e8a5d296bc827daf596..79657df7d52793ec2b9cc8f385947de13bac3203 100644
(file)
--- a/
src/language/lexer/lexer.c
+++ b/
src/language/lexer/lexer.c
@@
-22,6
+22,7
@@
#include <limits.h>
#include <math.h>
#include <stdarg.h>
#include <limits.h>
#include <math.h>
#include <stdarg.h>
+#include <stdint.h>
#include <stdlib.h>
#include <libpspp/assertion.h>
#include <language/command.h>
#include <stdlib.h>
#include <libpspp/assertion.h>
#include <language/command.h>
@@
-31,7
+32,6
@@
#include <libpspp/str.h>
#include <output/journal.h>
#include <libpspp/str.h>
#include <output/journal.h>
-#include "size_max.h"
#include "xalloc.h"
#include "gettext.h"
#include "xalloc.h"
#include "gettext.h"
@@
-1069,9
+1069,9
@@
convert_numeric_string_to_char_string (struct lexer *lexer,
byte_cnt = ds_length (&lexer->tokstr) / chars_per_byte;
if (ds_length (&lexer->tokstr) % chars_per_byte)
byte_cnt = ds_length (&lexer->tokstr) / chars_per_byte;
if (ds_length (&lexer->tokstr) % chars_per_byte)
- msg (SE, _("String of %s digits has %
d
characters, which is not a "
+ msg (SE, _("String of %s digits has %
zu
characters, which is not a "
"multiple of %d."),
"multiple of %d."),
- base_name,
(int)
ds_length (&lexer->tokstr), chars_per_byte);
+ base_name, ds_length (&lexer->tokstr), chars_per_byte);
p = ds_cstr (&lexer->tokstr);
for (i = 0; i < byte_cnt; i++)
p = ds_cstr (&lexer->tokstr);
for (i = 0; i < byte_cnt; i++)
@@
-1207,8
+1207,8
@@
finish:
if (ds_length (&lexer->tokstr) > 255)
{
if (ds_length (&lexer->tokstr) > 255)
{
- msg (SE, _("String exceeds 255 characters in length (%
d
characters)."),
-
(int)
ds_length (&lexer->tokstr));
+ msg (SE, _("String exceeds 255 characters in length (%
zu
characters)."),
+ ds_length (&lexer->tokstr));
ds_truncate (&lexer->tokstr, 255);
}
ds_truncate (&lexer->tokstr, 255);
}