projects
/
pspp-builds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2edc2ff
)
Correct printf conversion specifiers for size_t types.
fc11-i386-build0
lenny-x64-build21
sid-i386-build66
author
John Darrington
<john@darrington.wattle.id.au>
Mon, 28 Sep 2009 18:12:54 +0000
(20:12 +0200)
committer
John Darrington
<john@darrington.wattle.id.au>
Mon, 28 Sep 2009 18:12:54 +0000
(20:12 +0200)
src/data/dictionary.c
patch
|
blob
|
history
src/language/data-io/file-handle.q
patch
|
blob
|
history
src/language/data-io/print.c
patch
|
blob
|
history
src/language/stats/flip.c
patch
|
blob
|
history
tests/libpspp/sparse-xarray-test.c
patch
|
blob
|
history
diff --git
a/src/data/dictionary.c
b/src/data/dictionary.c
index 67af049b24fee7a72e3dd6b6561a6784f87a70b7..ab653d874193a46d1f9a83a03f1e15ac4e09e7a6 100644
(file)
--- a/
src/data/dictionary.c
+++ b/
src/data/dictionary.c
@@
-119,7
+119,7
@@
dict_dump (const struct dictionary *d)
{
const struct variable *v =
d->var[i];
{
const struct variable *v =
d->var[i];
- printf ("Name: %s;\tdict_idx: %
d; case_idx: %d
\n",
+ printf ("Name: %s;\tdict_idx: %
zu; case_idx: %zu
\n",
var_get_name (v),
var_get_dict_index (v),
var_get_case_index (v));
var_get_name (v),
var_get_dict_index (v),
var_get_case_index (v));
diff --git
a/src/language/data-io/file-handle.q
b/src/language/data-io/file-handle.q
index 3e053ed57262eb5f6e94d404ed5686253e640a16..33aa1d168a5c4efce423688b3d8998193b8c7abc 100644
(file)
--- a/
src/language/data-io/file-handle.q
+++ b/
src/language/data-io/file-handle.q
@@
-129,7
+129,7
@@
cmd_file_handle (struct lexer *lexer, struct dataset *ds)
{
if (cmd.n_lrecl[0] == LONG_MIN)
msg (SE, _("The specified file mode requires LRECL. "
{
if (cmd.n_lrecl[0] == LONG_MIN)
msg (SE, _("The specified file mode requires LRECL. "
- "Assuming %
d
-character records."),
+ "Assuming %
zu
-character records."),
properties.record_width);
else if (cmd.n_lrecl[0] < 1 || cmd.n_lrecl[0] >= (1UL << 31))
msg (SE, _("Record length (%ld) must be between 1 and %lu bytes. "
properties.record_width);
else if (cmd.n_lrecl[0] < 1 || cmd.n_lrecl[0] >= (1UL << 31))
msg (SE, _("Record length (%ld) must be between 1 and %lu bytes. "
diff --git
a/src/language/data-io/print.c
b/src/language/data-io/print.c
index e345477baf706f50add706bbac7e5f04b0d4057d..2cfa0177c77950f26495aa9a5bd421ab8df73488 100644
(file)
--- a/
src/language/data-io/print.c
+++ b/
src/language/data-io/print.c
@@
-435,12
+435,12
@@
dump_table (struct print_trns *trns, const struct file_handle *fh)
}
if (fh != NULL)
}
if (fh != NULL)
- tab_title (t, ngettext ("Writing %
d
record to %s.",
- "Writing %
d
records to %s.", trns->record_cnt),
+ tab_title (t, ngettext ("Writing %
zu
record to %s.",
+ "Writing %
zu
records to %s.", trns->record_cnt),
trns->record_cnt, fh_get_name (fh));
else
trns->record_cnt, fh_get_name (fh));
else
- tab_title (t, ngettext ("Writing %
d
record.",
- "Writing %
d
records.", trns->record_cnt),
+ tab_title (t, ngettext ("Writing %
zu
record.",
+ "Writing %
zu
records.", trns->record_cnt),
trns->record_cnt);
tab_submit (t);
}
trns->record_cnt);
tab_submit (t);
}
diff --git
a/src/language/stats/flip.c
b/src/language/stats/flip.c
index 3e595968d9c4c3232f719a1b48520a2a71dfdc37..c8cb03b92d7f75aff63dc5fe3ca549d8a4d2b365 100644
(file)
--- a/
src/language/stats/flip.c
+++ b/
src/language/stats/flip.c
@@
-211,7
+211,7
@@
cmd_flip (struct lexer *lexer, struct dataset *ds)
else
{
char s[VAR_NAME_LEN + 1];
else
{
char s[VAR_NAME_LEN + 1];
- sprintf (s, "VAR%03
d
", i);
+ sprintf (s, "VAR%03
zu
", i);
dict_create_var_assert (dict, s, 0);
}
dict_create_var_assert (dict, s, 0);
}
diff --git
a/tests/libpspp/sparse-xarray-test.c
b/tests/libpspp/sparse-xarray-test.c
index dd5a2a99307d2dee4c60cf524c9d8c63ac73d14e..279863e9baac10713ed6560222f68093f27924fe 100644
(file)
--- a/
tests/libpspp/sparse-xarray-test.c
+++ b/
tests/libpspp/sparse-xarray-test.c
@@
-182,7
+182,7
@@
check_state (struct mc *mc, struct test_state *ts, const struct test_model *tm)
for (col = 0; col < params->n_columns; col++)
if (data[col] != model->data[row][col])
{
for (col = 0; col < params->n_columns; col++)
if (data[col] != model->data[row][col])
{
- mc_error (mc, "xarray %d: element %
zu,%zu (of %zu,%zu
) "
+ mc_error (mc, "xarray %d: element %
d,%d (of %d,%d
) "
"differs: %d should be %d",
i, row, col, n_rows, n_columns, data[col],
model->data[row][col]);
"differs: %d should be %d",
i, row, col, n_rows, n_columns, data[col],
model->data[row][col]);
@@
-201,7
+201,7
@@
check_state (struct mc *mc, struct test_state *ts, const struct test_model *tm)
ds_clear (&ds);
for (col = 0; col < n_columns; col++)
ds_put_format (&ds, " %d", model->data[row][col]);
ds_clear (&ds);
for (col = 0; col < n_columns; col++)
ds_put_format (&ds, " %d", model->data[row][col]);
- mc_error (mc, "xarray %d: row %
zu
:%s", i, row, ds_cstr (&ds));
+ mc_error (mc, "xarray %d: row %
d
:%s", i, row, ds_cstr (&ds));
}
mc_error (mc, "xarray %d: actual:", i);
}
mc_error (mc, "xarray %d: actual:", i);
@@
-216,7
+216,7
@@
check_state (struct mc *mc, struct test_state *ts, const struct test_model *tm)
ds_clear (&ds);
for (col = 0; col < n_columns; col++)
ds_put_format (&ds, " %d", data[col]);
ds_clear (&ds);
for (col = 0; col < n_columns; col++)
ds_put_format (&ds, " %d", data[col]);
- mc_error (mc, "xarray %d: row %
zu
:%s", i, row, ds_cstr (&ds));
+ mc_error (mc, "xarray %d: row %
d
:%s", i, row, ds_cstr (&ds));
}
ds_destroy (&ds);
}
ds_destroy (&ds);
@@
-273,8
+273,8
@@
sparse_xarray_mc_init (struct mc *mc)
struct test_model tm;
int i;
struct test_model tm;
int i;
- mc_name_operation (mc, "empty sparse_xarray with n_columns=%
zu
, "
- "max_memory_rows=%
zu
",
+ mc_name_operation (mc, "empty sparse_xarray with n_columns=%
d
, "
+ "max_memory_rows=%
d
",
params->n_columns, params->max_memory_rows);
ts = xmalloc (sizeof *ts);
for (i = 0; i < params->n_xarrays; i++)
params->n_columns, params->max_memory_rows);
ts = xmalloc (sizeof *ts);
for (i = 0; i < params->n_xarrays; i++)