src/libpspp/message.c (prepare_diagnostic_information): Relocate locale_dir

[pspp] / src / math / merge.c

diff --git a/src/math/merge.c b/src/math/merge.c
index af44855ce1cbb7718dd18d48d459fc5cfe15fa8a..b5745ceeea062f21ad061882814101df8d497ab8 100644 (file)
--- a/src/math/merge.c
+++ b/src/math/merge.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2011 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
@@ -19,17 +19,17 @@
    performance regression. */
 #include <config.h>
 
-#include <math/merge.h>
+#include "math/merge.h"
 
-#include <data/case.h>
-#include <data/casereader.h>
-#include <data/casewriter.h>
-#include <data/subcase.h>
-#include <libpspp/array.h>
-#include <libpspp/assertion.h>
-#include <libpspp/taint.h>
+#include "data/case.h"
+#include "data/casereader.h"
+#include "data/casewriter.h"
+#include "data/subcase.h"
+#include "libpspp/array.h"
+#include "libpspp/assertion.h"
+#include "libpspp/taint.h"
 
-#include "xalloc.h"
+#include "gl/xalloc.h"
 
 #define MAX_MERGE_ORDER 7
 
@@ -86,7 +86,7 @@ merge_append (struct merge *m, struct casereader *r)
 struct casereader *
 merge_make_reader (struct merge *m)
 {
-  struct casereader *r;
+  struct casereader *r = NULL;
 
   if (m->input_cnt > 1)
     do_merge (m);
@@ -137,7 +137,7 @@ do_merge (struct merge *m)
     taint_propagate (casereader_get_taint (m->inputs[i].reader),
                      casewriter_get_taint (w));
 
-  for (i = 0; i < m->input_cnt; )
+  for (i = 0; i < m->input_cnt;)
     if (read_input_case (m, i))
       i++;
   while (m->input_cnt > 0)