Add the WARN_UNUSED_RESULT attribute to all hash functions.

[pspp] / src / data / value.h

diff --git a/src/data/value.h b/src/data/value.h
index f9782e2d867d47028f134c4b406dbfd53313d68c..299187285ad5843cd9fc9b549e053a9ebcfde769 100644 (file)
--- a/src/data/value.h
+++ b/src/data/value.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2007, 2009, 2010, 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
@@ -17,6 +17,7 @@
 #ifndef DATA_VALUE_H
 #define DATA_VALUE_H 1
 
+#include "libpspp/compiler.h"
 #include <assert.h>
 #include <stdbool.h>
 #include <stdlib.h>
@@ -51,6 +52,7 @@ union value
   };
 
 static inline void value_init (union value *, int width);
+static inline void value_clone (union value *, const union value *, int width);
 static inline bool value_needs_init (int width);
 static inline bool value_try_init (union value *, int width);
 static inline void value_destroy (union value *, int width);
@@ -70,16 +72,20 @@ void value_copy_buf_rpad (union value *dst, int dst_width,
 void value_set_missing (union value *, int width);
 int value_compare_3way (const union value *, const union value *, int width);
 bool value_equal (const union value *, const union value *, int width);
-unsigned int value_hash (const union value *, int width, unsigned int basis);
+unsigned int value_hash (const union value *, int width, unsigned int basis) WARN_UNUSED_RESULT;
 
 bool value_is_resizable (const union value *, int old_width, int new_width);
 bool value_needs_resize (int old_width, int new_width);
 void value_resize (union value *, int old_width, int new_width);
 
+bool value_is_spaces (const union value *, int width);
+
 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);
 \f
@@ -98,6 +104,17 @@ value_init (union value *v, int width)
     v->long_string = xmalloc (width);
 }
 
+/* Initializes V as a value of the given WIDTH, as with value_init(), and
+   copies SRC's value into V as its initial value. */
+static inline void
+value_clone (union value *v, const union value *src, int width)
+{
+  if (width <= MAX_SHORT_STRING)
+    *v = *src;
+  else
+    v->long_string = xmemdup (src->long_string, width);
+}
+
 /* Returns true if a value of the given WIDTH actually needs to
    have the value_init and value_destroy functions called, false
    if those functions are no-ops for values of the given WIDTH.