X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fcase-tmpfile.c;h=0290f51126380366a233e8a3e5dc1f6eb8c22a68;hb=77e2017715a58c01d3e63ad90fb28b5e39eb2a31;hp=b2444b9bc5f411ac9d826b9f093972461652b40b;hpb=1d57a8b4c556e227cd562dcfa56c8cbce79f73a8;p=pspp

diff --git a/src/data/case-tmpfile.c b/src/data/case-tmpfile.c
index b2444b9bc5..0290f51126 100644
--- a/src/data/case-tmpfile.c
+++ b/src/data/case-tmpfile.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2010, 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
@@ -16,18 +16,17 @@
 
 #include <config.h>
 
-#include <data/case-tmpfile.h>
+#include "data/case-tmpfile.h"
 
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <libpspp/assertion.h>
-#include <libpspp/taint.h>
-#include <libpspp/ext-array.h>
+#include "libpspp/assertion.h"
+#include "libpspp/taint.h"
+#include "libpspp/ext-array.h"
 
-#include "error.h"
-#include "xalloc.h"
+#include "gl/xalloc.h"
 
 /* A temporary file that stores an array of cases. */
 struct case_tmpfile
@@ -52,12 +51,12 @@ width_to_n_bytes (int width)
 static void *
 value_to_data (const union value *value_, int width)
 {
-  union value *value = (union value *) value_;
+  union value *value = CONST_CAST (union value *, value_);
   assert (sizeof value->f == sizeof (double));
   if (width == 0)
     return &value->f;
   else
-    return value_str_rw (value, width);
+    return value->s;
 }
 
 /* Creates and returns a new case_tmpfile that will store cases