From: John Darrington <john@darrington.wattle.id.au>
Date: Fri, 12 Aug 2016 04:43:40 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into sheet
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4246294842a8abedecaaf55aa87507225f03f58c;hp=4120a9b233c35c8fc6afc051cafe1c702661fe30;p=pspp

Merge remote-tracking branch 'origin/master' into sheet
---

diff --git a/src/language/lexer/variable-parser.c b/src/language/lexer/variable-parser.c
index a45d384293..390b98dae3 100644
--- a/src/language/lexer/variable-parser.c
+++ b/src/language/lexer/variable-parser.c
@@ -201,9 +201,9 @@ add_variable (struct variable ***v, size_t *nv, size_t *mv,
                "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)
         {
diff --git a/src/output/cairo.c b/src/output/cairo.c
index 1a8c78c69f..c7188af0b6 100644
--- a/src/output/cairo.c
+++ b/src/output/cairo.c
@@ -1078,7 +1078,8 @@ xr_layout_cell_text (struct xr_driver *xr,
             {
               if (brk && clip[H][0] != clip[H][1])
                 best = bottom;
-              *brk = bottom;
+              if (brk)
+                *brk = bottom;
             }
           else
             break;
diff --git a/src/ui/gui/help-menu.c b/src/ui/gui/help-menu.c
index aeef8c10c4..b5b38757c3 100644
--- a/src/ui/gui/help-menu.c
+++ b/src/ui/gui/help-menu.c
@@ -148,7 +148,7 @@ online_help (const char *page)
     {
       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
@@ -157,7 +157,8 @@ online_help (const char *page)
          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);
     }
diff --git a/src/ui/gui/psppire-import-assistant.c b/src/ui/gui/psppire-import-assistant.c
index 89d1cf8e6d..9374f7f68e 100644
--- a/src/ui/gui/psppire-import-assistant.c
+++ b/src/ui/gui/psppire-import-assistant.c
@@ -1740,18 +1740,24 @@ make_data_column (PsppireImportAssistant *ia, GtkWidget *tree_view,
 {
   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,
diff --git a/src/ui/gui/psppire-window.c b/src/ui/gui/psppire-window.c
index f3c360b35e..c268256bb0 100644
--- a/src/ui/gui/psppire-window.c
+++ b/src/ui/gui/psppire-window.c
@@ -196,7 +196,6 @@ psppire_window_set_property (GObject         *object,
                           : NULL);
       psppire_window_name_changed (window);
       break;
-      break;
     case PROP_ID:
       g_free (window->id);
       window->id = g_value_dup_string (value);