X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Flist.q;h=b5a16f265481e8d4d5bc0c957a3412235da3e039;hb=f15c854d8500105766b2f5666bb62b983ff24f88;hp=1df9411163a5d81b82dc0da670aa702601ac4fa4;hpb=43b1296aafe7582e7dbe6c2b6a8b478d7d9b0fcf;p=pspp-builds.git diff --git a/src/language/data-io/list.q b/src/language/data-io/list.q index 1df94111..b5a16f26 100644 --- a/src/language/data-io/list.q +++ b/src/language/data-io/list.q @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 2009 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 @@ -16,24 +16,25 @@ #include +#include #include #include #include "intprops.h" -#include "size_max.h" +#include "xmalloca.h" + #include #include #include #include #include #include +#include #include #include #include #include -#include #include -#include #include #include #include @@ -43,6 +44,7 @@ #include #include "minmax.h" +#include "xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) @@ -81,7 +83,7 @@ static unsigned n_chars_width (struct outp_driver *d); static void write_line (struct outp_driver *d, const char *s); /* Other functions. */ -static void list_case (struct ccase *, casenumber case_idx, +static void list_case (const struct ccase *, casenumber case_idx, const struct dataset *); static void determine_layout (void); static void clean_up (void); @@ -141,15 +143,15 @@ cmd_list (struct lexer *lexer, struct dataset *ds) return CMD_FAILURE; /* Fill in defaults. */ - if (cmd.step == NOT_LONG) + if (cmd.step == LONG_MIN) cmd.step = 1; - if (cmd.first == NOT_LONG) + if (cmd.first == LONG_MIN) cmd.first = 1; - if (cmd.last == NOT_LONG) + if (cmd.last == LONG_MIN) cmd.last = LONG_MAX; if (!cmd.sbc_variables) dict_get_vars (dict, &cmd.v_variables, &cmd.n_variables, - (1u << DC_SYSTEM) | (1u << DC_SCRATCH)); + DC_SYSTEM | DC_SCRATCH); if (cmd.n_variables == 0) { msg (SE, _("No variables specified.")); @@ -234,15 +236,15 @@ cmd_list (struct lexer *lexer, struct dataset *ds) casegrouper_get_next_group (grouper, &group); casereader_destroy (group)) { - struct ccase c; + struct ccase *c; write_all_headers (group, ds); - for (; casereader_read (group, &c); case_destroy (&c)) + for (; (c = casereader_read (group)) != NULL; case_unref (c)) { case_idx++; if (case_idx >= cmd.first && case_idx <= cmd.last && (case_idx - cmd.first) % cmd.step == 0) - list_case (&c, case_idx, ds); + list_case (c, case_idx, ds); } } ok = casegrouper_destroy (grouper); @@ -263,12 +265,13 @@ static void write_all_headers (struct casereader *input, const struct dataset *ds) { struct outp_driver *d; - struct ccase c; + struct ccase *c; - if (!casereader_peek (input, 0, &c)) + c = casereader_peek (input, 0); + if (c == NULL) return; - output_split_file_values (ds, &c); - case_destroy (&c); + output_split_file_values (ds, c); + case_unref (c); for (d = outp_drivers (NULL); d; d = outp_drivers (d)) { @@ -463,8 +466,8 @@ write_fallback_headers (struct outp_driver *d) int line_number = 0; const char *Line = _("Line"); - char *leader = local_alloc (strlen (Line) - + INT_STRLEN_BOUND (line_number) + 1 + 1); + char *leader = xmalloca (strlen (Line) + + INT_STRLEN_BOUND (line_number) + 1 + 1); while (index < cmd.n_variables) { @@ -506,7 +509,7 @@ write_fallback_headers (struct outp_driver *d) } { - char varname[LONG_NAME_LEN + 2]; + char varname[VAR_NAME_LEN + 2]; snprintf (varname, sizeof varname, " %s", var_get_name (cmd.v_variables[index])); write_varname (d, varname, leader_width); @@ -518,7 +521,7 @@ write_fallback_headers (struct outp_driver *d) d->cp_x = 0; d->cp_y += d->font_height; - local_free (leader); + freea (leader); } /* There are three possible layouts for the LIST procedure: @@ -647,7 +650,8 @@ determine_layout (void) /* Writes case C to output. */ static void -list_case (struct ccase *c, casenumber case_idx, const struct dataset *ds) +list_case (const struct ccase *c, casenumber case_idx, + const struct dataset *ds) { struct dictionary *dict = dataset_dict (ds); struct outp_driver *d; @@ -702,18 +706,21 @@ list_case (struct ccase *c, casenumber case_idx, const struct dataset *ds) if (fmt_is_string (print->type) || dict_contains_var (dict, v)) { - data_out (case_data (c, v), print, - ds_put_uninit (&line_buffer, print->w)); + char *s = data_out (case_data (c, v), print); + ds_put_cstr (&line_buffer, s); + free (s); } else { + char *s; union value case_idx_value; case_idx_value.f = case_idx; - data_out (&case_idx_value, print, - ds_put_uninit (&line_buffer,print->w)); + s = data_out (&case_idx_value, print); + ds_put_cstr (&line_buffer, s); + free (s); } - ds_put_char(&line_buffer, ' '); + ds_put_char (&line_buffer, ' '); } if (!n_lines_remaining (d)) @@ -736,20 +743,21 @@ list_case (struct ccase *c, casenumber case_idx, const struct dataset *ds) { const struct variable *v = cmd.v_variables[column]; const struct fmt_spec *print = var_get_print_format (v); - char buf[256]; + char *s = NULL; if (fmt_is_string (print->type) || dict_contains_var (dict, v)) - data_out (case_data (c, v), print, buf); + s = data_out (case_data (c, v), print); else { union value case_idx_value; case_idx_value.f = case_idx; - data_out (&case_idx_value, print, buf); + s = data_out (&case_idx_value, print); } fputs (" ", x->file); - html_put_cell_contents (d, TAB_FIX, ss_buffer (buf, print->w)); + html_put_cell_contents (d, TAB_FIX, ss_buffer (s, print->w)); + free (s); fputs ("\n", x->file); }