X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fll.h;h=65ecf55f2cad759a50085a85e90f1e3c79cf7f02;hb=3bbb4370239deb29ebbf813d258aef6249e2a431;hp=269c81424df077c342a9abd143cb85ba47051a2e;hpb=363146425140109e009256f769b78a44a4f27bb6;p=pspp-builds.git

diff --git a/src/libpspp/ll.h b/src/libpspp/ll.h
index 269c8142..65ecf55f 100644
--- a/src/libpspp/ll.h
+++ b/src/libpspp/ll.h
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
    Copyright (C) 2006 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 <http://www.gnu.org/licenses/>. */
 
 /* Circular doubly linked lists.
 
@@ -104,7 +102,7 @@
      ll_for_each (foo, struct foo, ll, &list)
        {
          ...do something with foo->x...
-       }      
+       }
 */
 
 /* Returns the data structure corresponding to the given node LL,
@@ -338,15 +336,15 @@ struct ll *ll_find_partition (const struct ll *r0, const struct ll *r1,
 #define ll_tail__(STRUCT, MEMBER, LIST)                         \
         ll_data__ (ll_tail (LIST), STRUCT, MEMBER, LIST)
 #define ll_next__(DATA, STRUCT, MEMBER, LIST)                           \
-        ll_data__ (ll_next (&DATA->MEMBER), STRUCT, MEMBER, LIST)
+        ll_data__ (ll_next (&(DATA)->MEMBER), STRUCT, MEMBER, LIST)
 #define ll_prev__(DATA, STRUCT, MEMBER, LIST)                           \
-        ll_data__ (ll_prev (&DATA->MEMBER), STRUCT, MEMBER, LIST)
+        ll_data__ (ll_prev (&(DATA)->MEMBER), STRUCT, MEMBER, LIST)
 
 /* Inline functions. */
 
 /* Initializes LIST as an empty list. */
 static inline void
-ll_init (struct ll_list *list) 
+ll_init (struct ll_list *list)
 {
   list->null.next = list->null.prev = &list->null;
 }
@@ -355,7 +353,7 @@ ll_init (struct ll_list *list)
    false if LIST is not empty (has at least one other node).
    Executes in O(1) time. */
 static inline bool
-ll_is_empty (const struct ll_list *list) 
+ll_is_empty (const struct ll_list *list)
 {
   return ll_head (list) == ll_null (list);
 }
@@ -371,14 +369,14 @@ ll_head (const struct ll_list *list)
 /* Returns the last node in LIST,
    or the null node if LIST is empty. */
 static inline struct ll *
-ll_tail (const struct ll_list *list) 
+ll_tail (const struct ll_list *list)
 {
   return ll_prev (ll_null (list));
 }
 
 /* Returns LIST's null node. */
 static inline struct ll *
-ll_null (const struct ll_list *list) 
+ll_null (const struct ll_list *list)
 {
   return (struct ll *) &list->null;
 }
@@ -387,7 +385,7 @@ ll_null (const struct ll_list *list)
    or the null node if LL is at the end of its list.
    (In an empty list, the null node follows itself.) */
 static inline struct ll *
-ll_next (const struct ll *ll) 
+ll_next (const struct ll *ll)
 {
   return ll->next;
 }
@@ -403,14 +401,14 @@ ll_prev (const struct ll *ll)
 
 /* Inserts LL at the head of LIST. */
 static inline void
-ll_push_head (struct ll_list *list, struct ll *ll) 
+ll_push_head (struct ll_list *list, struct ll *ll)
 {
   ll_insert (ll_head (list), ll);
 }
 
 /* Inserts LL at the tail of LIST. */
 static inline void
-ll_push_tail (struct ll_list *list, struct ll *ll) 
+ll_push_tail (struct ll_list *list, struct ll *ll)
 {
   ll_insert (ll_null (list), ll);
 }
@@ -430,7 +428,7 @@ ll_pop_head (struct ll_list *list)
 /* Removes and returns the last node in LIST,
    which must not be empty. */
 static inline struct ll *
-ll_pop_tail (struct ll_list *list) 
+ll_pop_tail (struct ll_list *list)
 {
   struct ll *tail;
   assert (!ll_is_empty (list));
@@ -442,7 +440,7 @@ ll_pop_tail (struct ll_list *list)
 /* Inserts NEW_ELEM just before BEFORE.
    (NEW_ELEM must not already be in a list.) */
 static inline void
-ll_insert (struct ll *before, struct ll *new_elem) 
+ll_insert (struct ll *before, struct ll *new_elem)
 {
   struct ll *before_prev = ll_prev (before);
   new_elem->next = before;
@@ -463,9 +461,9 @@ ll_remove (struct ll *ll)
 
 /* Removes R0...R1 from their list. */
 static inline void
-ll_remove_range (struct ll *r0, struct ll *r1) 
+ll_remove_range (struct ll *r0, struct ll *r1)
 {
-  if (r0 != r1) 
+  if (r0 != r1)
     {
       r1 = r1->prev;
       r0->prev->next = r1->next;
@@ -479,7 +477,7 @@ ll_remove_range (struct ll *r0, struct ll *r1)
    before moving LL, then ll_insert() afterward, but more
    efficient. */
 static inline void
-ll_moved (struct ll *ll) 
+ll_moved (struct ll *ll)
 {
   ll->prev->next = ll->next->prev = ll;
 }