"All variables in this variable list must have the "
"same width. %s will be omitted from the list."),
var_get_name ((*v)[0]), add_name, add_name);
- else if ((pv_opts & PV_NO_DUPLICATE) && included[idx])
+ else if ((pv_opts & PV_NO_DUPLICATE) && included && included[idx])
msg (SE, _("Variable %s appears twice in variable list."), add_name);
- else if ((pv_opts & PV_DUPLICATE) || !included[idx])
+ else if ((pv_opts & PV_DUPLICATE) || !included || !included[idx])
{
if (*nv >= *mv)
{
{
if (brk && clip[H][0] != clip[H][1])
best = bottom;
- *brk = bottom;
+ if (brk)
+ *brk = bottom;
}
else
break;
{
gchar **tokens = NULL;
const int maxtokens = 5;
- int idx = 0;
+ int idx ;
argv[1] = g_strdup_printf ("file://%s#%s",
relocate (DOCDIR "/pspp.xml"), page);
/* The page will be translated to the htmlfilename
QUICK-CLUSTER QUICK-CLUSTER.html
which is valid for the multiple page html doc*/
tokens = g_strsplit (page, "#", maxtokens);
- for(;tokens[idx] && idx < maxtokens;idx++);
+ for (idx = 0; idx < maxtokens && tokens[idx]; idx++)
+ ;
htmlfilename = g_strdup_printf ("%s.html", tokens[idx-1]);
g_strfreev (tokens);
}
{
struct variable *var = NULL;
struct column *column = NULL;
- size_t char_cnt;
+ size_t char_cnt = 0;
gint content_width, header_width;
PsppSheetViewColumn *tree_column;
- char *name;
+ char *name = NULL;
if (input)
- column = &ia->columns[dict_idx];
+ {
+ column = &ia->columns[dict_idx];
+ name = escape_underscores (column->name);
+ char_cnt = column->width;
+ }
else
- var = dict_get_var (ia->dict, dict_idx);
+ {
+ var = dict_get_var (ia->dict, dict_idx);
+ name = escape_underscores (var_get_name (var));
+ char_cnt = var_get_print_format (var)->w;
+ }
- name = escape_underscores (input ? column->name : var_get_name (var));
- char_cnt = input ? column->width : var_get_print_format (var)->w;
content_width = get_monospace_width (tree_view, ia->fixed_renderer,
char_cnt);
header_width = get_string_width (tree_view, ia->prop_renderer,
: NULL);
psppire_window_name_changed (window);
break;
- break;
case PROP_ID:
g_free (window->id);
window->id = g_value_dup_string (value);