From e324cc0398afd760f6820a0ce12777f0133b3b0c Mon Sep 17 00:00:00 2001
From: Sebastian Pop <seb@napoca.(none)>
Date: Mon, 9 Jun 2008 14:20:32 -0500
Subject: [PATCH] never use loop->usr

---
 include/cloog/loop.h | 12 +++++++++++-
 source/loop.c        |  6 +++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/include/cloog/loop.h b/include/cloog/loop.h
index d013545..96f75b9 100644
--- a/include/cloog/loop.h
+++ b/include/cloog/loop.h
@@ -64,7 +64,7 @@ struct cloogloop
                                *   (filled only after loop generation).
                                */
   CloogBlock * _block ;        /**< The included statement block, NULL if none.*/
-  void * usr;		      /**< User field, for library user convenience.
+  void * _usr;		      /**< User field, for library user convenience.
 			       *   This pointer is not freed when the
 			       *   CloogLoop structure is freed.
 			       */
@@ -119,6 +119,16 @@ static inline void cloog_loop_set_block (CloogLoop *l, CloogBlock *b)
   l->_block = b;
 }
 
+static inline void *cloog_loop_usr (CloogLoop *l)
+{
+  return l->_usr;
+}
+
+static inline void cloog_loop_set_usr (CloogLoop *l, void *u)
+{
+  l->_usr = u;
+}
+
 
 /******************************************************************************
  *                          Structure display function                        *
diff --git a/source/loop.c b/source/loop.c
index 567b19d..5cbc3ff 100644
--- a/source/loop.c
+++ b/source/loop.c
@@ -301,7 +301,7 @@ CloogLoop * cloog_loop_read(FILE * foo, int number, int nb_parameters)
   /* included statement block. */
   statement = cloog_statement_alloc(number+1);
   cloog_loop_set_block (loop, cloog_block_alloc (statement, NULL, 0, NULL, nb_iterators));
-  loop->usr = NULL;
+  cloog_loop_set_usr (loop, NULL);
   /* inner is NULL at beginning. */
   loop->inner = NULL ;
   /* next element. */
@@ -343,7 +343,7 @@ CloogLoop * cloog_loop_malloc()
   /* We set the various fields with default values. */
   cloog_loop_set_domain (loop, NULL);
   cloog_loop_set_block (loop, NULL);
-  loop->usr    = NULL;
+  cloog_loop_set_usr (loop, NULL);
   loop->inner  = NULL ;
   loop->next   = NULL ;
   cloog_loop_init_stride (loop);
@@ -444,7 +444,7 @@ CloogLoop * cloog_loop_copy(CloogLoop * source)
       domain = cloog_domain_copy (cloog_loop_domain (source));
       block  = cloog_block_copy (cloog_loop_block (source));
       loop   = cloog_loop_alloc(domain,cloog_loop_stride (source),block,NULL,NULL) ;
-      loop->usr = source->usr;
+      cloog_loop_set_usr (loop, cloog_loop_usr (source));
       loop->inner = cloog_loop_copy(source->inner) ;
       loop->next = cloog_loop_copy(source->next) ;
     }
-- 
2.11.4.GIT