Module: xenomai-3
Branch: master
Commit: eb764d10cd88b23fc82419ad04b4ddbf4a59deb1
URL:    
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=eb764d10cd88b23fc82419ad04b4ddbf4a59deb1

Author: Philippe Gerum <r...@xenomai.org>
Date:   Tue Jun 16 14:43:52 2015 +0200

boilerplate/list: rename to listobj (avoid conflict with STL)

---

 include/boilerplate/hash.h        |    2 +-
 include/boilerplate/shared-list.h |   34 +++++++++++++++++-----------------
 include/copperplate/heapobj.h     |    6 +++---
 include/copperplate/syncobj.h     |    4 ++--
 lib/alchemy/queue.h               |    2 +-
 lib/analogy/calibration.c         |    2 +-
 lib/analogy/calibration.h         |    2 +-
 lib/copperplate/internal.h        |    2 +-
 lib/copperplate/registry.c        |    2 +-
 lib/psos/queue.h                  |    2 +-
 lib/vxworks/msgQLib.h             |    2 +-
 utils/analogy/calibration_ni_m.c  |   10 +++++-----
 12 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/include/boilerplate/hash.h b/include/boilerplate/hash.h
index 2d77d2f..733be9b 100644
--- a/include/boilerplate/hash.h
+++ b/include/boilerplate/hash.h
@@ -34,7 +34,7 @@ struct hashobj {
 };
 
 struct hash_bucket {
-       struct list obj_list;
+       struct listobj obj_list;
 };
 
 struct hash_table {
diff --git a/include/boilerplate/shared-list.h 
b/include/boilerplate/shared-list.h
index a98cbe0..0f88d6f 100644
--- a/include/boilerplate/shared-list.h
+++ b/include/boilerplate/shared-list.h
@@ -31,7 +31,7 @@ struct holder {
        dref_type(struct holder *) prev;
 };
 
-struct list {
+struct listobj {
        struct holder head;
 };
 
@@ -78,17 +78,17 @@ static inline void dth(struct holder *holder)
        __dth(__main_heap, holder);
 }
 
-static inline void __list_init(void *heap, struct list *list)
+static inline void __list_init(void *heap, struct listobj *list)
 {
        __inith(heap, &list->head);
 }
 
-static inline void __list_init_nocheck(void *heap, struct list *list)
+static inline void __list_init_nocheck(void *heap, struct listobj *list)
 {
        __inith_nocheck(heap, &list->head);
 }
 
-static inline void list_init(struct list *list)
+static inline void list_init(struct listobj *list)
 {
        __list_init(__main_heap, list);
 }
@@ -124,23 +124,23 @@ static inline int holder_linked(const struct holder 
*holder)
 }
 
 static inline void __list_prepend(void *heap, struct holder *holder,
-                                 struct list *list)
+                                 struct listobj *list)
 {
        __ath(heap, &list->head, holder);
 }
 
-static inline void list_prepend(struct holder *holder, struct list *list)
+static inline void list_prepend(struct holder *holder, struct listobj *list)
 {
        __list_prepend(__main_heap, holder, list);
 }
 
 static inline void __list_append(void *heap, struct holder *holder,
-                                struct list *list)
+                                struct listobj *list)
 {
        __ath(heap, __hptr(heap, list->head.prev), holder);
 }
 
-static inline void list_append(struct holder *holder, struct list *list)
+static inline void list_append(struct holder *holder, struct listobj *list)
 {
        __list_append(__main_heap, holder, list);
 }
@@ -155,8 +155,8 @@ static inline void list_insert(struct holder *next, struct 
holder *prev)
        __list_insert(__main_heap, next, prev);
 }
 
-static inline void __list_join(void *heap, struct list *lsrc,
-                              struct list *ldst)
+static inline void __list_join(void *heap, struct listobj *lsrc,
+                              struct listobj *ldst)
 {
        struct holder *headsrc = __hptr(heap, lsrc->head.next);
        struct holder *tailsrc = __hptr(heap, lsrc->head.prev);
@@ -170,7 +170,7 @@ static inline void __list_join(void *heap, struct list 
*lsrc,
        headdst->next = __hoff(heap, headsrc);
 }
 
-static inline void list_join(struct list *lsrc, struct list *ldst)
+static inline void list_join(struct listobj *lsrc, struct listobj *ldst)
 {
        __list_join(__main_heap, lsrc, ldst);
 }
@@ -196,36 +196,36 @@ static inline void list_remove_init(struct holder *holder)
        __list_remove_init(__main_heap, holder);
 }
 
-static inline int __list_empty(void *heap, const struct list *list)
+static inline int __list_empty(void *heap, const struct listobj *list)
 {
        return list->head.next == __hoff(heap, &list->head);
 }
 
-static inline int list_empty(const struct list *list)
+static inline int list_empty(const struct listobj *list)
 {
        return __list_empty(__main_heap, list);
 }
 
-static inline struct holder *__list_pop(void *heap, struct list *list)
+static inline struct holder *__list_pop(void *heap, struct listobj *list)
 {
        struct holder *holder = __hptr(heap, list->head.next);
        __list_remove(heap, holder);
        return holder;
 }
 
-static inline struct holder *list_pop(struct list *list)
+static inline struct holder *list_pop(struct listobj *list)
 {
        return __list_pop(__main_heap, list);
 }
 
 static inline int __list_heading_p(void *heap, const struct holder *holder,
-                                  const struct list *list)
+                                  const struct listobj *list)
 {
        return list->head.next == __hoff(heap, holder);
 }
 
 static inline int list_heading_p(const struct holder *holder,
-                                const struct list *list)
+                                const struct listobj *list)
 {
        return __list_heading_p(__main_heap, holder, list);
 }
diff --git a/include/copperplate/heapobj.h b/include/copperplate/heapobj.h
index b628ea4..0e70843 100644
--- a/include/copperplate/heapobj.h
+++ b/include/copperplate/heapobj.h
@@ -43,9 +43,9 @@ struct heapobj {
 
 struct sysgroup {
        int thread_count;
-       struct list thread_list;
+       struct listobj thread_list;
        int heap_count;
-       struct list heap_list;
+       struct listobj heap_list;
        pthread_mutex_t lock;
 };
 
@@ -235,7 +235,7 @@ static inline memoff_t mainheap_off(void *addr)
        })
 
 static inline void
-__sysgroup_add(struct sysgroup_memspec *obj, struct list *q, int *countp)
+__sysgroup_add(struct sysgroup_memspec *obj, struct listobj *q, int *countp)
 {
        write_lock_nocancel(&__main_sysgroup->lock);
        (*countp)++;
diff --git a/include/copperplate/syncobj.h b/include/copperplate/syncobj.h
index e8ff8cd..66dee02 100644
--- a/include/copperplate/syncobj.h
+++ b/include/copperplate/syncobj.h
@@ -65,9 +65,9 @@ struct syncobj {
        unsigned int magic;
        int flags;
        int wait_count;
-       struct list grant_list;
+       struct listobj grant_list;
        int grant_count;
-       struct list drain_list;
+       struct listobj drain_list;
        int drain_count;
        struct syncobj_corespec core;
        fnref_type(void (*)(struct syncobj *sobj)) finalizer;
diff --git a/lib/alchemy/queue.h b/lib/alchemy/queue.h
index 8aa3327..86f2d00 100644
--- a/lib/alchemy/queue.h
+++ b/lib/alchemy/queue.h
@@ -34,7 +34,7 @@ struct alchemy_queue {
        struct heapobj hobj;
        struct syncobj sobj;
        struct clusterobj cobj;
-       struct list mq;
+       struct listobj mq;
        unsigned int mcount;
        struct fsobj fsobj;
 };
diff --git a/lib/analogy/calibration.c b/lib/analogy/calibration.c
index 331dcac..c54cd7d 100644
--- a/lib/analogy/calibration.c
+++ b/lib/analogy/calibration.c
@@ -137,7 +137,7 @@ static inline void write_calibration(FILE *file, char *fmt, 
...)
 }
 
 void
-write_calibration_file(FILE *dst, struct list *l,
+write_calibration_file(FILE *dst, struct listobj *l,
                       struct a4l_calibration_subdev *subd, a4l_desc_t *desc)
 {
        struct subdevice_calibration_node *e, *t;
diff --git a/lib/analogy/calibration.h b/lib/analogy/calibration.h
index 50e898c..5d881b5 100644
--- a/lib/analogy/calibration.h
+++ b/lib/analogy/calibration.h
@@ -61,7 +61,7 @@ struct subdevice_calibration_node {
        unsigned range;
 };
 
-void write_calibration_file(FILE *dst, struct list *l,
+void write_calibration_file(FILE *dst, struct listobj *l,
                             struct a4l_calibration_subdev *subd,
                            a4l_desc_t *desc);
 
diff --git a/lib/copperplate/internal.h b/lib/copperplate/internal.h
index eaaa340..7837fb7 100644
--- a/lib/copperplate/internal.h
+++ b/lib/copperplate/internal.h
@@ -49,7 +49,7 @@
 struct shared_heap {
        char name[XNOBJECT_NAME_LEN];
        pthread_mutex_t lock;
-       struct list extents;
+       struct listobj extents;
        size_t extentsize;
        size_t hdrsize;
        size_t npages;
diff --git a/lib/copperplate/registry.c b/lib/copperplate/registry.c
index f123ee9..4648773 100644
--- a/lib/copperplate/registry.c
+++ b/lib/copperplate/registry.c
@@ -932,7 +932,7 @@ ssize_t fsobstack_pull(struct fsobstack *o, char *buf, 
size_t size)
 
 static int collect_wait_list(struct fsobstack *o,
                             struct syncobj *sobj,
-                            struct list *wait_list,
+                            struct listobj *wait_list,
                             int *wait_count,
                             struct fsobstack_syncops *ops)
 {
diff --git a/lib/psos/queue.h b/lib/psos/queue.h
index 4ca4389..8a364b1 100644
--- a/lib/psos/queue.h
+++ b/lib/psos/queue.h
@@ -37,7 +37,7 @@ struct psos_queue {
        u_long msgcount;
 
        struct syncobj sobj;
-       struct list msg_list;
+       struct listobj msg_list;
        struct clusterobj cobj;
 };
 
diff --git a/lib/vxworks/msgQLib.h b/lib/vxworks/msgQLib.h
index f6a1749..817e90d 100644
--- a/lib/vxworks/msgQLib.h
+++ b/lib/vxworks/msgQLib.h
@@ -34,7 +34,7 @@ struct wind_mq {
 
        struct heapobj pool;
        struct syncobj sobj;
-       struct list msg_list;
+       struct listobj msg_list;
 };
 
 struct wind_queue_wait {
diff --git a/utils/analogy/calibration_ni_m.c b/utils/analogy/calibration_ni_m.c
index 2ffc012..c72a44d 100644
--- a/utils/analogy/calibration_ni_m.c
+++ b/utils/analogy/calibration_ni_m.c
@@ -25,8 +25,8 @@
 
 #include "calibration_ni_m.h"
 #include "calibration.h"
-struct list ai_calibration_list;
-struct list ao_calibration_list;
+struct listobj ai_calibration_list;
+struct listobj ao_calibration_list;
 
 static struct references references;
 static struct a4l_calibration_subdev mem_subd;
@@ -674,7 +674,7 @@ static int calibrate_base_range(struct polynomial *dst, 
struct polynomial *src)
 }
 
 
-static struct subdevice_calibration_node *get_calibration_node(struct list *l,
+static struct subdevice_calibration_node *get_calibration_node(struct listobj 
*l,
                                                               unsigned channel,
                                                               unsigned range)
 {
@@ -743,7 +743,7 @@ static int calibrate_pwm(struct polynomial *dst, struct 
pwm_info *pwm_info,
        return 0;
 }
 
-static int append_calibration_node(struct list *l, struct polynomial 
*polynomial,
+static int append_calibration_node(struct listobj *l, struct polynomial 
*polynomial,
                                   unsigned channel, unsigned range)
 {
        struct subdevice_calibration_node *q;
@@ -813,7 +813,7 @@ static int calibrate_ai_range(struct polynomial *dst,
 static int calibrate_ranges_above_threshold(struct polynomial *pwm_calibration,
                                            struct polynomial *non_lin_correct,
                                            unsigned pos_ref,
-                                           struct list *calibration_list,
+                                           struct listobj *calibration_list,
                                            struct calibrated_ranges 
*calibrated,
                                            double max_range_threshold )
 {


_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://xenomai.org/mailman/listinfo/xenomai-git

Reply via email to