X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fllx.h;h=80a8a838063e3c2a3e05963c11030f4d141f5803;hb=aa2cd68fb42668614f168df3a319e48d009c3cc7;hp=0db6183cc6097515dd81119110d53b21c1a31db5;hpb=f5c108becd49d78f4898cab11352291f5689d24e;p=pspp
diff --git a/src/libpspp/llx.h b/src/libpspp/llx.h
index 0db6183cc6..80a8a83806 100644
--- a/src/libpspp/llx.h
+++ b/src/libpspp/llx.h
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
- Copyright (C) 2006 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+ Copyright (C) 2006, 2011 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 the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see . */
/* Circular doubly linked lists.
@@ -51,7 +49,7 @@
#include
#include
-#include
+#include "libpspp/ll.h"
/* External, circular doubly linked list.
@@ -112,6 +110,12 @@ struct llx_list
struct ll_list ll_list; /* The list. */
};
+/* Suitable for use as the initializer for a `struct llx_list'
+ named LIST. Typical usage:
+ struct llx_list list = LLX_INITIALIZER (list);
+ LLX_INITIALIZER() is an alternative to llx_init(). */
+#define LLX_INITIALIZER(LIST) { LL_INITIALIZER ((LIST).ll_list) }
+
/* Memory manager. */
struct llx_manager
{
@@ -182,6 +186,8 @@ size_t llx_remove_if (struct llx *r0, struct llx *r1,
const struct llx_manager *);
/* Non-mutating algorithms. */
+struct llx *llx_find (const struct llx *r0, const struct llx *r1,
+ const void *target);
struct llx *llx_find_equal (const struct llx *r0, const struct llx *r1,
const void *target,
llx_compare_func *, void *aux);