X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fxforms%2Fsample.c;h=260841a6029b541ddd97dc3ca811391dfee68471;hb=80595f6de2ea8f0b64756d76c7ac3c89a1abbbb8;hp=4cf66c20ae017f0658113edd017bdb0b25e893b7;hpb=3816248a008a4af75aac6319d0c9929cb7ff679e;p=pspp

diff --git a/src/language/xforms/sample.c b/src/language/xforms/sample.c
index 4cf66c20ae..260841a602 100644
--- a/src/language/xforms/sample.c
+++ b/src/language/xforms/sample.c
@@ -1,21 +1,18 @@
-/* PSPP - computes sample statistics.
-   Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
-   Written by Ben Pfaff <blp@gnu.org>.
+/* PSPP - a program for statistical analysis.
+   Copyright (C) 1997-9, 2000, 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 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>
 
@@ -24,15 +21,16 @@
 #include <stdio.h>
 #include <math.h>
 
-#include <data/procedure.h>
-#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 "data/dataset.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/compiler.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
+#include "math/random.h"
+
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -79,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;
     }
@@ -100,7 +98,7 @@ cmd_sample (struct lexer *lexer, struct dataset *ds)
 	       a, b);
 	  return CMD_FAILURE;
 	}
-      
+
       frac = 0;
     }
   lex_get (lexer);
@@ -113,18 +111,18 @@ cmd_sample (struct lexer *lexer, struct dataset *ds)
   trns->frac = frac;
   add_transformation (ds, sample_trns_proc, sample_trns_free, trns);
 
-  return lex_end_of_command (lexer);
+  return CMD_SUCCESS;
 }
 
 /* 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;
@@ -150,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);