Add README explaining not to use msg() here.

[pspp-builds.git] / src / ui / gui / psppire-case-array.c

diff --git a/src/ui/gui/psppire-case-array.c b/src/ui/gui/psppire-case-array.c
index 159b3cc122fc42e0fb5c8348cffce97453f15440..edff51fa2833d1572f93892620189efd52a73b0e 100644 (file)
--- a/src/ui/gui/psppire-case-array.c
+++ b/src/ui/gui/psppire-case-array.c
@@ -24,9 +24,10 @@
 
 #include "psppire-object.h"
 #include "psppire-case-array.h"
-#include "gtkextra-marshal.h"
 
-#include "case.h"
+#include <gtksheet/gtkextra-marshal.h>
+
+#include <data/case.h>
 
 /* --- prototypes --- */
 static void psppire_case_array_class_init      (PsppireCaseArrayClass  *class);
@@ -217,12 +218,13 @@ psppire_case_array_iterate_case(PsppireCaseArray *ca,
 void
 psppire_case_array_insert_case(PsppireCaseArray *ca, gint posn)
 {
+  gint i;
+
   g_return_if_fail(posn >= 0);
   g_return_if_fail(posn <= ca->size);
 
   g_assert(ca->size + 1 <= ca->capacity);
 
-  gint i;
 
   for(i = ca->size; i > posn ; --i)
       case_move(&ca->cases[i], &ca->cases[i - 1]);
@@ -236,11 +238,12 @@ psppire_case_array_insert_case(PsppireCaseArray *ca, gint posn)
 void
 psppire_case_array_delete_cases(PsppireCaseArray *ca, gint first, gint n_cases)
 {
+  gint i;
+
   g_return_if_fail(n_cases > 0);
   g_return_if_fail(first >= 0);
   g_return_if_fail(first + n_cases < ca->size);
   
-  gint i;
 
   /* FIXME: Is this right ?? */
   for ( i = first; i < first + n_cases ; ++i ) 
@@ -289,13 +292,17 @@ psppire_case_array_set_value(PsppireCaseArray *ca, gint c, gint idx,
                          value_fill_func_t ff,
                          gpointer data)
 {
+  struct ccase *cc ;
+  union value *val ;
+  gboolean changed ;
+
   g_return_if_fail(c < ca->size);
 
-  struct ccase *cc = &ca->cases[c];
+  cc = &ca->cases[c];
 
-  union value *val = case_data_rw(cc, idx);
+  val = case_data_rw(cc, idx);
 
-  gboolean changed = ff(val, data);
+  changed = ff(val, data);
 
   case_unshare(cc);