X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fattributes.h;h=56d142e4c23ceb375e7c11e220fa4f34cde62346;hb=62b5101a28fc2c4a9b8b26a998fb6c4ec12d84c7;hp=87cb7726f8e01a2846299e5da069cba41bbaa244;hpb=9e0e4996fad6563f0a1ce628b80db5c23ef8279e;p=pspp diff --git a/src/data/attributes.h b/src/data/attributes.h index 87cb7726f8..56d142e4c2 100644 --- a/src/data/attributes.h +++ b/src/data/attributes.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2008 Free Software Foundation, Inc. + Copyright (C) 2008, 2011, 2012, 2016 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,7 +17,7 @@ #ifndef DATA_ATTRIBUTES_H #define DATA_ATTRIBUTES_H 1 -#include +#include "libpspp/hmapx.h" /* This header supports custom attribute of the sort maintained by the DATAFILE ATTRIBUTE and VARIABLE ATTRIBUTE commands. @@ -41,7 +41,7 @@ void attribute_set_value (struct attribute *, size_t index, const char *); void attribute_del_value (struct attribute *, size_t index); size_t attribute_get_n_values (const struct attribute *); -struct attrset +struct attrset { struct hmap map; }; @@ -52,7 +52,8 @@ void attrset_destroy (struct attrset *); size_t attrset_count (const struct attrset *); -struct attribute *attrset_lookup (struct attrset *, const char *); +struct attribute *attrset_lookup (const struct attrset *, const char *); +bool attrset_try_add (struct attrset *, struct attribute *); void attrset_add (struct attrset *, struct attribute *); void attrset_delete (struct attrset *, const char *); void attrset_clear (struct attrset *); @@ -65,6 +66,6 @@ struct attribute *attrset_first (const struct attrset *, struct attrset_iterator *); struct attribute *attrset_next (const struct attrset *, struct attrset_iterator *); - +struct attribute **attrset_sorted (const struct attrset *); #endif /* data/attributes.h */