X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fxforms%2Fsample.c;h=6fbc758c2e1329f41d57d626daa9eb8ca75b495a;hb=refs%2Ftags%2Fsid-i386-build159;hp=dafaecee646a84176385396e2b1c90d192d4637b;hpb=480a0746507ce73d26f528b56dc3ed80195096e0;p=pspp-builds.git

diff --git a/src/language/xforms/sample.c b/src/language/xforms/sample.c
index dafaecee..6fbc758c 100644
--- a/src/language/xforms/sample.c
+++ b/src/language/xforms/sample.c
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
-   Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+   Copyright (C) 1997-9, 2000, 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 the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   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
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 
@@ -27,12 +25,13 @@
 #include <data/variable.h>
 #include <language/command.h>
 #include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
 #include <libpspp/compiler.h>
 #include <libpspp/message.h>
 #include <libpspp/str.h>
 #include <math/random.h>
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
@@ -78,7 +77,7 @@ cmd_sample (struct lexer *lexer, struct dataset *ds)
 		     "exclusive."));
 	  return CMD_FAILURE;
 	}
-	  
+
       frac = lex_tokval (lexer) * (max - min) + min;
       a = b = 0;
     }
@@ -99,7 +98,7 @@ cmd_sample (struct lexer *lexer, struct dataset *ds)
 	       a, b);
 	  return CMD_FAILURE;
 	}
-      
+
       frac = 0;
     }
   lex_get (lexer);
@@ -117,13 +116,13 @@ cmd_sample (struct lexer *lexer, struct dataset *ds)
 
 /* Executes a SAMPLE transformation. */
 static int
-sample_trns_proc (void *t_, struct ccase *c UNUSED,
+sample_trns_proc (void *t_, struct ccase **c UNUSED,
                   casenumber case_num UNUSED)
 {
   struct sample_trns *t = t_;
   double U;
 
-  if (t->type == TYPE_FRACTION) 
+  if (t->type == TYPE_FRACTION)
     {
       if (gsl_rng_get (get_rng ()) <= t->frac)
         return TRNS_CONTINUE;
@@ -149,7 +148,7 @@ sample_trns_proc (void *t_, struct ccase *c UNUSED,
 }
 
 static bool
-sample_trns_free (void *t_) 
+sample_trns_free (void *t_)
 {
   struct sample_trns *t = t_;
   free (t);