[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp ChangeLog Smake src/data/datasheet.c src/d...
|
From: |
Ben Pfaff |
|
Subject: |
[Pspp-cvs] pspp ChangeLog Smake src/data/datasheet.c src/d... |
|
Date: |
Sat, 13 Oct 2007 04:35:27 +0000 |
CVSROOT: /cvsroot/pspp
Module name: pspp
Changes by: Ben Pfaff <blp> 07/10/13 04:35:27
Modified files:
. : ChangeLog Smake
src/data : datasheet.c por-file-reader.c sys-file-reader.c
src/language/data-io: file-handle.q get.c placement-parser.c
print.c
src/language/dictionary: modify-variables.c rename-variables.c
sys-file-info.c
src/language/lexer: lexer.c
src/language/stats: aggregate.c autorecode.c npar.q oneway.q
t-test.q
src/language/tests: float-format.c moments-test.c
src/language/xforms: recode.c
tests : automake.mk
Log message:
posix-xprintf-functions.patch from patch #6230.
Add fprintf-posix, printf-posix, printf-safe,
snprintf-posix, sprintf-posix, vasprintf-posxi, vfprintf-posix,
vprintf-posix, vsnprintf-posix, and vsprintf-posix modules, which
allow us to use C99 format specifiers (e.g. 'z') in *printf.
Also, changed many formerly casted arguments in *printf calls to
use one of these format specifiers and drop the cast.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/ChangeLog?cvsroot=pspp&r1=1.88&r2=1.89
http://cvs.savannah.gnu.org/viewcvs/pspp/Smake?cvsroot=pspp&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/datasheet.c?cvsroot=pspp&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/por-file-reader.c?cvsroot=pspp&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/sys-file-reader.c?cvsroot=pspp&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/data-io/file-handle.q?cvsroot=pspp&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/data-io/get.c?cvsroot=pspp&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/data-io/placement-parser.c?cvsroot=pspp&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/data-io/print.c?cvsroot=pspp&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/dictionary/modify-variables.c?cvsroot=pspp&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/dictionary/rename-variables.c?cvsroot=pspp&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/dictionary/sys-file-info.c?cvsroot=pspp&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/lexer/lexer.c?cvsroot=pspp&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/aggregate.c?cvsroot=pspp&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/autorecode.c?cvsroot=pspp&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/npar.q?cvsroot=pspp&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/oneway.q?cvsroot=pspp&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/t-test.q?cvsroot=pspp&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/tests/float-format.c?cvsroot=pspp&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/tests/moments-test.c?cvsroot=pspp&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/xforms/recode.c?cvsroot=pspp&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/automake.mk?cvsroot=pspp&r1=1.41&r2=1.42
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/ChangeLog,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -b -r1.88 -r1.89
--- ChangeLog 12 Oct 2007 04:54:46 -0000 1.88
+++ ChangeLog 13 Oct 2007 04:35:25 -0000 1.89
@@ -1,3 +1,12 @@
+2007-10-12 Ben Pfaff <address@hidden>
+
+ * Smake: Add fprintf-posix, printf-posix, printf-safe,
+ snprintf-posix, sprintf-posix, vasprintf-posxi, vfprintf-posix,
+ vprintf-posix, vsnprintf-posix, and vsprintf-posix modules, which
+ allow us to use C99 format specifiers (e.g. 'z') in *printf.
+ Also, changed many formerly casted arguments in *printf calls to
+ use one of these format specifiers and drop the cast.
+
2007-10-11 Ben Pfaff <address@hidden>
* Smake: Drop alloca, alloca-opt modules as we don't use them
Index: Smake
===================================================================
RCS file: /cvsroot/pspp/pspp/Smake,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- Smake 12 Oct 2007 04:54:46 -0000 1.61
+++ Smake 13 Oct 2007 04:35:26 -0000 1.62
@@ -13,6 +13,7 @@
dirname \
exit \
fpieee \
+ fprintf-posix \
full-read \
full-write \
fseeko \
@@ -37,9 +38,13 @@
memset \
minmax \
mkstemp \
+ printf-posix \
+ printf-safe \
progname \
relocatable-prog \
snprintf \
+ snprintf-posix \
+ sprintf-posix \
stdarg \
stdbool \
stdint \
@@ -57,7 +62,12 @@
tmpfile \
unistd \
unlocked-io \
+ vasprintf-posix \
+ vfprintf-posix \
+ vprintf-posix \
vsnprintf \
+ vsnprintf-posix \
+ vsprintf-posix \
xalloc \
xalloc-die \
xmalloca \
Index: src/data/datasheet.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/datasheet.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- src/data/datasheet.c 2 Oct 2007 04:13:07 -0000 1.9
+++ src/data/datasheet.c 13 Oct 2007 04:35:26 -0000 1.10
@@ -1374,8 +1374,8 @@
mc_error (mc, "row count (%lu) does not match expected (%zu)",
(unsigned long int) datasheet_get_row_cnt (ds), row_cnt);
else if (column_cnt != datasheet_get_column_cnt (ds))
- mc_error (mc, "column count (%lu) does not match expected (%zu)",
- (unsigned long int) datasheet_get_column_cnt (ds), column_cnt);
+ mc_error (mc, "column count (%zu) does not match expected (%zu)",
+ datasheet_get_column_cnt (ds), column_cnt);
else
{
size_t row, col;
Index: src/data/por-file-reader.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/por-file-reader.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- src/data/por-file-reader.c 12 Oct 2007 04:59:26 -0000 1.24
+++ src/data/por-file-reader.c 13 Oct 2007 04:35:26 -0000 1.25
@@ -515,9 +515,9 @@
/* Validate file. */
if (strlen (date) != 8)
- error (r, _("Bad date string length %d."), (int) strlen (date));
+ error (r, _("Bad date string length %zu."), strlen (date));
if (strlen (time) != 6)
- error (r, _("Bad time string length %d."), (int) strlen (time));
+ error (r, _("Bad time string length %zu."), strlen (time));
/* Save file info. */
if (info != NULL)
Index: src/data/sys-file-reader.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/sys-file-reader.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- src/data/sys-file-reader.c 12 Oct 2007 04:59:26 -0000 1.48
+++ src/data/sys-file-reader.c 13 Oct 2007 04:35:26 -0000 1.49
@@ -509,8 +509,8 @@
len = read_int (r);
if (len >= sizeof label)
- sys_error (r, _("Variable %s has label of invalid length %u."),
- name, (unsigned int) len);
+ sys_error (r, _("Variable %s has label of invalid length %zu."),
+ name, len);
read_string (r, label, len + 1);
var_set_label (var, label);
@@ -608,7 +608,7 @@
bool ok;
if (!fmt_from_io (raw_type, &f.type))
- sys_error (r, _("Unknown variable format %d."), (int) raw_type);
+ sys_error (r, _("Unknown variable format %"PRIu8"."), raw_type);
f.w = w;
f.d = d;
@@ -769,9 +769,9 @@
int expected_integer_format;
if (size != 4 || count != 8)
- sys_error (r, _("Bad size (%u) or count (%u) field on record type 7, "
+ sys_error (r, _("Bad size (%zu) or count (%zu) field on record type 7, "
"subtype 3."),
- (unsigned int) size, (unsigned int) count);
+ size, count);
/* Save version info. */
info->version_major = version_major;
@@ -819,8 +819,8 @@
double lowest = read_float (r);
if (size != 8 || count != 3)
- sys_error (r, _("Bad size (%u) or count (%u) on extension 4."),
- (unsigned int) size, (unsigned int) count);
+ sys_error (r, _("Bad size (%zu) or count (%zu) on extension 4."),
+ size, count);
if (sysmis != SYSMIS)
sys_warn (r, _("File specifies unexpected value %g as SYSMIS."), sysmis);
@@ -841,8 +841,8 @@
int i;
if (count % 3 || n_vars != dict_get_var_cnt (dict))
- sys_error (r, _("Bad size (%u) or count (%u) on extension 11."),
- (unsigned int) size, (unsigned int) count);
+ sys_error (r, _("Bad size (%zu) or count (%zu) on extension 11."),
+ size, count);
for (i = 0; i < n_vars; ++i)
{
@@ -1082,8 +1082,8 @@
var_cnt = read_int (r);
if (var_cnt < 1 || var_cnt > dict_get_var_cnt (dict))
sys_error (r, _("Number of variables associated with a value label (%d) "
- "is not between 1 and the number of variables (%u)."),
- var_cnt, (unsigned int) dict_get_var_cnt (dict));
+ "is not between 1 and the number of variables (%zu)."),
+ var_cnt, dict_get_var_cnt (dict));
/* Read the list of variables. */
var = pool_nalloc (subpool, var_cnt, sizeof *var);
Index: src/language/data-io/file-handle.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/data-io/file-handle.q,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- src/language/data-io/file-handle.q 12 Oct 2007 04:59:27 -0000 1.17
+++ src/language/data-io/file-handle.q 13 Oct 2007 04:35:26 -0000 1.18
@@ -96,12 +96,12 @@
if (cmd.n_lrecl[0] == LONG_MIN)
msg (SE, _("Fixed-length records were specified on /RECFORM, but "
"record length was not specified on /LRECL. "
- "Assuming %u-character records."),
- (unsigned int) properties.record_width);
+ "Assuming %zu-character records."),
+ properties.record_width);
else if (cmd.n_lrecl[0] < 1)
msg (SE, _("Record length (%ld) must be at least one byte. "
- "Assuming %u-character records."),
- cmd.n_lrecl[0], (unsigned int) properties.record_width);
+ "Assuming %zu-character records."),
+ cmd.n_lrecl[0], properties.record_width);
else
properties.record_width = cmd.n_lrecl[0];
break;
Index: src/language/data-io/get.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/data-io/get.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- src/language/data-io/get.c 12 Oct 2007 04:59:27 -0000 1.43
+++ src/language/data-io/get.c 13 Oct 2007 04:35:26 -0000 1.44
@@ -564,10 +564,10 @@
goto done;
if (nn != nv)
{
- msg (SE, _("Number of variables on left side of `=' (%d) does not "
- "match number of variables on right side (%d), in "
+ msg (SE, _("Number of variables on left side of `=' (%zu) does not "
+ "match number of variables on right side (%zu), in "
"parenthesized group %d of RENAME subcommand."),
- (unsigned) (nv - old_nv), (unsigned) (nn - old_nv), group);
+ nv - old_nv, nn - old_nv, group);
goto done;
}
if (!lex_force_match (lexer, ')'))
Index: src/language/data-io/placement-parser.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/data-io/placement-parser.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- src/language/data-io/placement-parser.c 7 Jul 2007 06:14:13 -0000
1.7
+++ src/language/data-io/placement-parser.c 13 Oct 2007 04:35:26 -0000
1.8
@@ -82,9 +82,9 @@
if (assignment_cnt != var_cnt)
{
- msg (SE, _("Number of variables specified (%d) "
- "differs from number of variable formats (%d)."),
- (int) var_cnt, (int) assignment_cnt);
+ msg (SE, _("Number of variables specified (%zu) "
+ "differs from number of variable formats (%zu)."),
+ var_cnt, assignment_cnt);
return false;
}
@@ -115,8 +115,8 @@
if ((lc - fc + 1) % var_cnt)
{
msg (SE, _("The %d columns %d-%d "
- "can't be evenly divided into %u fields."),
- lc - fc + 1, fc, lc, (unsigned int) var_cnt);
+ "can't be evenly divided into %zu fields."),
+ lc - fc + 1, fc, lc, var_cnt);
return false;
}
Index: src/language/data-io/print.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/data-io/print.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- src/language/data-io/print.c 12 Oct 2007 04:59:27 -0000 1.28
+++ src/language/data-io/print.c 13 Oct 2007 04:35:26 -0000 1.29
@@ -256,9 +256,9 @@
}
if (trns->record_cnt != 0 && trns->record_cnt != record)
- msg (SW, _("Output calls for %d records but %u specified on RECORDS "
+ msg (SW, _("Output calls for %d records but %zu specified on RECORDS "
"subcommand."),
- record, (unsigned int) trns->record_cnt);
+ record, trns->record_cnt);
trns->record_cnt = record;
return true;
Index: src/language/dictionary/modify-variables.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/dictionary/modify-variables.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- src/language/dictionary/modify-variables.c 12 Oct 2007 04:59:27 -0000
1.22
+++ src/language/dictionary/modify-variables.c 13 Oct 2007 04:35:26 -0000
1.23
@@ -206,9 +206,8 @@
if (prev_nv_1 != vm.rename_cnt)
{
msg (SE, _("Differing number of variables in old name list "
- "(%d) and in new name list (%d)."),
- (int) (vm.rename_cnt - prev_nv_2),
- (int) (prev_nv_1 - prev_nv_2));
+ "(%zu) and in new name list (%zu)."),
+ vm.rename_cnt - prev_nv_2, prev_nv_1 - prev_nv_2);
for (i = 0; i < prev_nv_1; i++)
free (vm.new_names[i]);
free (vm.new_names);
Index: src/language/dictionary/rename-variables.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/dictionary/rename-variables.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- src/language/dictionary/rename-variables.c 12 Oct 2007 04:59:27 -0000
1.13
+++ src/language/dictionary/rename-variables.c 13 Oct 2007 04:35:26 -0000
1.14
@@ -74,9 +74,8 @@
size_t i;
msg (SE, _("Differing number of variables in old name list "
- "(%d) and in new name list (%d)."),
- (int) (rename_cnt - prev_nv_2),
- (int) (prev_nv_1 - prev_nv_2));
+ "(%zu) and in new name list (%zu)."),
+ rename_cnt - prev_nv_2, prev_nv_1 - prev_nv_2);
for (i = 0; i < prev_nv_1; i++)
free (rename_new_names[i]);
free (rename_new_names);
Index: src/language/dictionary/sys-file-info.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/dictionary/sys-file-info.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- src/language/dictionary/sys-file-info.c 12 Oct 2007 04:59:27 -0000
1.32
+++ src/language/dictionary/sys-file-info.c 13 Oct 2007 04:35:26 -0000
1.33
@@ -130,8 +130,7 @@
: info.float_format == FLOAT_Z_LONG ? _("IBM 390 Hex Long.")
: _("Unknown."));
tab_text (t, 0, 5, TAB_LEFT, _("Variables:"));
- tab_text (t, 1, 5, TAB_LEFT | TAT_PRINTF, "%u",
- (unsigned int) dict_get_var_cnt (d));
+ tab_text (t, 1, 5, TAB_LEFT | TAT_PRINTF, "%zu", dict_get_var_cnt (d));
tab_text (t, 0, 6, TAB_LEFT, _("Cases:"));
tab_text (t, 1, 6, TAB_LEFT | TAT_PRINTF,
info.case_cnt == -1 ? _("Unknown") : "%ld",
@@ -424,8 +423,8 @@
}
if (as != AS_NAMES)
{
- tab_text (t, pc, r, TAT_PRINTF, "%d",
- (int) var_get_dict_index (v) + 1);
+ tab_text (t, pc, r, TAT_PRINTF, "%zu",
+ var_get_dict_index (v) + 1);
tab_hline (t, TAL_1, 0, nc - 1, r);
}
r++;
@@ -459,7 +458,7 @@
/* Put the name, var label, and position into the first row. */
tab_text (t, 0, r, TAB_LEFT, var_get_name (v));
- tab_text (t, 3, r, TAT_PRINTF, "%d", (int) var_get_dict_index (v) + 1);
+ tab_text (t, 3, r, TAT_PRINTF, "%zu", var_get_dict_index (v) + 1);
if (as == AS_DICTIONARY && var_has_label (v))
{
@@ -647,7 +646,7 @@
char fmt_string[FMT_STRING_LEN_MAX + 1];
fmt_to_string (var_get_print_format (var), fmt_string);
- tab_text (t, 1, row, TAB_RIGHT | TAT_PRINTF, "%d", (int) j + 1);
+ tab_text (t, 1, row, TAB_RIGHT | TAT_PRINTF, "%zu", j + 1);
tab_text (t, 2, row, TAB_LEFT, var_get_name (var));
tab_text (t, 3, row, TAB_LEFT, fmt_string);
row++;
Index: src/language/lexer/lexer.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/lexer/lexer.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- src/language/lexer/lexer.c 12 Oct 2007 05:07:17 -0000 1.29
+++ src/language/lexer/lexer.c 13 Oct 2007 04:35:26 -0000 1.30
@@ -1069,9 +1069,9 @@
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."),
- 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++)
@@ -1207,8 +1207,8 @@
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);
}
Index: src/language/stats/aggregate.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/aggregate.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- src/language/stats/aggregate.c 12 Oct 2007 04:59:28 -0000 1.37
+++ src/language/stats/aggregate.c 13 Oct 2007 04:35:27 -0000 1.38
@@ -485,8 +485,8 @@
}
else
{
- msg (SE, _("Missing argument %d to %s."),
- (int) i + 1, function->name);
+ msg (SE, _("Missing argument %zu to %s."),
+ i + 1, function->name);
goto error;
}
@@ -516,9 +516,9 @@
like `unknown variable t'. */
if (n_src != n_dest)
{
- msg (SE, _("Number of source variables (%u) does not match "
- "number of target variables (%u)."),
- (unsigned) n_src, (unsigned) n_dest);
+ msg (SE, _("Number of source variables (%zu) does not match "
+ "number of target variables (%zu)."),
+ n_src, n_dest);
goto error;
}
Index: src/language/stats/autorecode.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/autorecode.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- src/language/stats/autorecode.c 12 Oct 2007 04:59:28 -0000 1.23
+++ src/language/stats/autorecode.c 13 Oct 2007 04:35:27 -0000 1.24
@@ -133,9 +133,9 @@
{
size_t i;
- msg (SE, _("Source variable count (%u) does not match "
- "target variable count (%u)."),
- (unsigned) arc.var_cnt, (unsigned) dst_cnt);
+ msg (SE, _("Source variable count (%zu) does not match "
+ "target variable count (%zu)."),
+ arc.var_cnt, dst_cnt);
for (i = 0; i < dst_cnt; i++)
free (arc.dst_names[i]);
Index: src/language/stats/npar.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/npar.q,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- src/language/stats/npar.q 7 Jul 2007 06:14:17 -0000 1.8
+++ src/language/stats/npar.q 13 Oct 2007 04:35:27 -0000 1.9
@@ -423,8 +423,8 @@
{
if ( n_vlist1 != n_vlist2)
msg (SE, _("PAIRED was specified but the number of variables "
- "preceding WITH (%d) did not match the number "
- "following (%d)."), (int) n_vlist1, (int) n_vlist2);
+ "preceding WITH (%zu) did not match the number "
+ "following (%zu)."), n_vlist1, n_vlist2);
test_parameters->n_pairs = n_vlist1 ;
}
Index: src/language/stats/oneway.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/oneway.q,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- src/language/stats/oneway.q 12 Oct 2007 04:59:28 -0000 1.28
+++ src/language/stats/oneway.q 13 Oct 2007 04:35:27 -0000 1.29
@@ -175,8 +175,7 @@
sum += subc_list_double_at(&cmd.dl_contrast[i],j);
if ( sum != 0.0 )
- msg(SW,_("Coefficients for contrast %d do not total zero"),
- (int) i + 1);
+ msg(SW,_("Coefficients for contrast %zu do not total zero"), i + 1);
}
if ( stat_tables & STAT_DESC )
Index: src/language/stats/t-test.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/t-test.q,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- src/language/stats/t-test.q 12 Oct 2007 05:07:17 -0000 1.31
+++ src/language/stats/t-test.q 13 Oct 2007 04:35:27 -0000 1.32
@@ -484,9 +484,9 @@
{
free (vars);
msg (SE, _("PAIRED was specified but the number of variables "
- "preceding WITH (%d) did not match the number "
- "following (%d)."),
- (int) n_before_WITH, (int) n_after_WITH );
+ "preceding WITH (%zu) did not match the number "
+ "following (%zu)."),
+ n_before_WITH, n_after_WITH);
return 0;
}
n_pairs_local = n_before_WITH;
Index: src/language/tests/float-format.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/tests/float-format.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- src/language/tests/float-format.c 7 Jul 2007 06:14:18 -0000 1.5
+++ src/language/tests/float-format.c 13 Oct 2007 04:35:27 -0000 1.6
@@ -121,8 +121,9 @@
{
if (length != float_get_size (fp->format))
{
- msg (SE, _("%d-byte string needed but %d-byte string supplied."),
- (int) float_get_size (fp->format), (int) length);
+ msg (SE, _("%zu-byte string needed but %zu-byte string "
+ "supplied."),
+ float_get_size (fp->format), length);
return false;
}
assert (length <= sizeof fp->data);
Index: src/language/tests/moments-test.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/tests/moments-test.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- src/language/tests/moments-test.c 7 Jul 2007 06:14:18 -0000 1.12
+++ src/language/tests/moments-test.c 13 Oct 2007 04:35:27 -0000 1.13
@@ -123,7 +123,7 @@
fprintf (stderr, "W=%.3f", weight);
for (i = 0; i < 4; i++)
{
- fprintf (stderr, " M%d=", (int) i + 1);
+ fprintf (stderr, " M%zu=", i + 1);
if (M[i] == SYSMIS)
fprintf (stderr, "sysmis");
else if (fabs (M[i]) <= 0.0005)
Index: src/language/xforms/recode.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/xforms/recode.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- src/language/xforms/recode.c 12 Oct 2007 04:59:29 -0000 1.27
+++ src/language/xforms/recode.c 13 Oct 2007 04:35:27 -0000 1.28
@@ -436,10 +436,10 @@
if (name_cnt != trns->var_cnt)
{
- msg (SE, _("%u variable(s) cannot be recoded into "
- "%u variable(s). Specify the same number "
+ msg (SE, _("%zu variable(s) cannot be recoded into "
+ "%zu variable(s). Specify the same number "
"of variables as source and target variables."),
- (unsigned) trns->var_cnt, (unsigned) name_cnt);
+ trns->var_cnt, name_cnt);
return false;
}
Index: tests/automake.mk
===================================================================
RCS file: /cvsroot/pspp/pspp/tests/automake.mk,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- tests/automake.mk 9 Oct 2007 03:50:20 -0000 1.41
+++ tests/automake.mk 13 Oct 2007 04:35:27 -0000 1.42
@@ -161,6 +161,7 @@
src/libpspp/ll.c \
src/libpspp/ll.h \
tests/libpspp/ll-test.c
+tests_libpspp_ll_test_LDADD = gl/libgl.la @LIBINTL@
tests_libpspp_llx_test_SOURCES = \
src/libpspp/ll.c \
@@ -168,6 +169,7 @@
src/libpspp/llx.c \
src/libpspp/llx.h \
tests/libpspp/llx-test.c
+tests_libpspp_llx_test_LDADD = gl/libgl.la @LIBINTL@
tests_libpspp_heap_test_SOURCES = \
src/libpspp/heap.c \
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pspp-cvs] pspp ChangeLog Smake src/data/datasheet.c src/d...,
Ben Pfaff <=