Frequencies Dialog: Avoid initialising things more than once per dialog

[pspp] / src / data / value.c

diff --git a/src/data/value.c b/src/data/value.c
index 6dbecb11abfca8137bc8fdc763ffc1c0a8568bc2..ce80076235f8c730a3be760f4931b6a19e0c05ae 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, 2011, 2012 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 <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
-#include <data/value.h>
 
-#include <data/val-type.h>
-#include <data/variable.h>
-#include <libpspp/hash.h>
-#include <libpspp/pool.h>
-#include <libpspp/str.h>
-#include <gl/unistr.h>
+#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
@@ -172,6 +173,21 @@ value_resize (union value *value, int old_width, int new_width)
     }
 }
 
+/* Returns true if VALUE, with the given WIDTH, is all spaces, false otherwise.
+   Returns false if VALUE is numeric. */
+bool
+value_is_spaces (const union value *value, int width)
+{
+  const uint8_t *s = value_str (value, width);
+  int i;
+
+  for (i = 0; i < width; i++)
+    if (s[i] != ' ')
+      return false;
+
+  return true;
+}
+
 /* Returns true if resizing a value from OLD_WIDTH to NEW_WIDTH
    actually changes anything, false otherwise.  If false is
    returned, calls to value_resize() with the specified
@@ -211,6 +227,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.