From 1a2c9f9cff3917a6aac038dd805c6c0380b79c6e Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Fri, 2 Apr 2010 16:47:14 -0700 Subject: [PATCH] value: New function value_clone_pool(). --- src/data/value.c | 18 +++++++++++++++++- src/data/value.h | 2 ++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/data/value.c b/src/data/value.c index 6dbecb11ab..422639b178 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 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 @@ -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. diff --git a/src/data/value.h b/src/data/value.h index 61df087754..9205bc1a03 100644 --- a/src/data/value.h +++ b/src/data/value.h @@ -81,6 +81,8 @@ static inline void value_swap (union value *, union value *); struct pool; void value_init_pool (struct pool *, union value *, int width); +void value_clone_pool (struct pool *, union value *, const union value *, + int width); void value_resize_pool (struct pool *, union value *, int old_width, int new_width); -- 2.30.2