X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fvalue.c;h=144f39b5241d1fb7b8b36021e57c23cea65a22ae;hb=81579d9e9f994fb2908f50af41c3eb033d216e58;hp=6dbecb11abfca8137bc8fdc763ffc1c0a8568bc2;hpb=b40baf410822471fbdeeec553693619d60d7c7b6;p=pspp-builds.git
diff --git a/src/data/value.c b/src/data/value.c
index 6dbecb11..144f39b5 100644
--- a/src/data/value.c
+++ b/src/data/value.c
@@ -1,5 +1,5 @@
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2009 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 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
@@ -15,17 +15,18 @@
along with this program. If not, see . */
#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
+#include "data/value.h"
-#include "minmax.h"
-#include "xalloc.h"
+#include "data/val-type.h"
+#include "data/variable.h"
+#include "libpspp/hash-functions.h"
+#include "libpspp/pool.h"
+#include "libpspp/str.h"
+#include "gl/unistr.h"
+
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
/* Copies the contents of string value SRC with width SRC_WIDTH
to string value DST with width DST_WIDTH. If SRC_WIDTH is
@@ -211,6 +212,22 @@ value_init_pool (struct pool *pool, union value *value, int width)
value->long_string = pool_alloc_unaligned (pool, width);
}
+/* Same as value_clone(), except that memory for VALUE (if necessary) is
+ allocated from POOL and will be freed automatically when POOL is destroyed.
+
+ VALUE must not be freed manually by calling value_destroy(). If it needs to
+ be resized, it must be done using value_resize_pool() instead of
+ value_resize(). */
+void
+value_clone_pool (struct pool *pool,
+ union value *value, const union value *src, int width)
+{
+ if (width > MAX_SHORT_STRING)
+ value->long_string = pool_clone_unaligned (pool, src->long_string, width);
+ else
+ *value = *src;
+}
+
/* Same as value_resize, except that VALUE must have been
allocated from POOL using value_init_pool.