message: Add column range to struct msg_locator.

[pspp] / src / data / value.c

diff --git a/src/data/value.c b/src/data/value.c
index 6dbecb11abfca8137bc8fdc763ffc1c0a8568bc2..65b250e085f40c1a791735bbb6273c2df7f664ff 100644 (file)
--- 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 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,7 +19,7 @@
 
 #include <data/val-type.h>
 #include <data/variable.h>
-#include <libpspp/hash.h>
+#include <libpspp/hash-functions.h>
 #include <libpspp/pool.h>
 #include <libpspp/str.h>
 #include <gl/unistr.h>
@@ -211,6 +211,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.