Update typeof() usage for configured TYPEOF_FUNC.

diff --git a/bacula/src/lib/alist.h b/bacula/src/lib/alist.h
index 3a86867d34b59f7171d3fb6e386a2d28e2bff4f0..96d144a2fd38b30b69ba5842030a31fea8829c63 100644 (file)
--- a/bacula/src/lib/alist.h
+++ b/bacula/src/lib/alist.h
@@ -34,7 +34,7 @@ extern bool is_null(const void *ptr);
  */
 #ifdef HAVE_TYPEOF
 #define foreach_alist(var, list) \
-        for((var)=(typeof(var))(list)->first(); (var); (var)=(typeof(var))(list)->next() )
+        for((var)=(TYPEOF_FUNC(var))(list)->first(); (var); (var)=(TYPEOF_FUNC(var))(list)->next() )
 #else
 #define foreach_alist(var, list) \
     for((*((void **)&(var))=(void*)((list)->first())); \
@@ -44,7 +44,7 @@ extern bool is_null(const void *ptr);
 
 #ifdef HAVE_TYPEOF
 #define foreach_alist_index(inx, var, list) \
-        for(inx=0; ((var)=(typeof(var))(list)->get(inx)); inx++ )
+        for(inx=0; ((var)=(TYPEOF_FUNC(var))(list)->get(inx)); inx++ )
 #else
 #define foreach_alist_index(inx, var, list) \
     for(inx=0; ((*((void **)&(var))=(void*)((list)->get(inx)))); inx++ )

diff --git a/bacula/src/lib/dlist.h b/bacula/src/lib/dlist.h
index 02cfd732fb82d3f0e5e8a904f605311bf40e0179..2d2d4c20b16683e9d53aa21b1e17ee2851b18462 100644 (file)
--- a/bacula/src/lib/dlist.h
+++ b/bacula/src/lib/dlist.h
@@ -46,7 +46,7 @@
  */
 #ifdef HAVE_TYPEOF
 #define foreach_dlist(var, list) \
-        for((var)=NULL; ((var)=(typeof(var))(list)->next(var)); )
+        for((var)=NULL; ((var)=(TYPEOF_FUNC(var))(list)->next(var)); )
 #else
 #define foreach_dlist(var, list) \
     for((var)=NULL; (*((void **)&(var))=(void*)((list)->next(var))); )

diff --git a/bacula/src/lib/htable.h b/bacula/src/lib/htable.h
index f535465089632c30c71bc5615bd30104e9f609a9..599e8dd9bed52b590a734c225602f22781a6b3c4 100644 (file)
--- a/bacula/src/lib/htable.h
+++ b/bacula/src/lib/htable.h
@@ -35,7 +35,7 @@
  *
  */
 
-/* 
+/*
  * BIG_MALLOC is to provide a large malloc service to htable
  */
 #define BIG_MALLOC
@@ -45,9 +45,9 @@
  */
 #ifdef HAVE_TYPEOF
 #define foreach_htable(var, tbl) \
-        for((var)=(typeof(var))((tbl)->first()); \
+        for((var)=(TYPEOF_FUNC(var))((tbl)->first()); \
            (var); \
-           (var)=(typeof(var))((tbl)->next()))
+           (var)=(TYPEOF_FUNC(var))((tbl)->next()))
 #else
 #define foreach_htable(var, tbl) \
         for((*((void **)&(var))=(void *)((tbl)->first())); \
@@ -58,7 +58,7 @@
 union key_val {
    char *key;                   /* char key */
    uint64_t ikey;               /* integer key */
-}; 
+};
 
 struct hlink {
    void *next;                        /* next hash item */

diff --git a/bacula/src/lib/parse_conf.h b/bacula/src/lib/parse_conf.h
index 20304731130831bd823b7711c50ca475c0e6a3c7..3af72eda315cb7f245e120d1634b82189a45256e 100644 (file)
--- a/bacula/src/lib/parse_conf.h
+++ b/bacula/src/lib/parse_conf.h
@@ -346,7 +346,7 @@ bool find_config_file(const char *config_file, char *full_path, int max_path);
 /* Loop through each resource of type, returning in var */
 #ifdef HAVE_TYPEOF
 #define foreach_res(var, type) \
-        for((var)=NULL; ((var)=(typeof(var))GetNextRes((type), (RES *)var));)
+        for((var)=NULL; ((var)=(TYPEOF_FUNC(var))GetNextRes((type), (RES *)var));)
 #else
 #define foreach_res(var, type) \
     for(var=NULL; (*((void **)&(var))=(void *)GetNextRes((type), (RES *)var));)

diff --git a/bacula/src/lib/rblist.h b/bacula/src/lib/rblist.h
index becd7377d7d04f0f89f1f1bb6b9a23f9f7e0b536..676a5019e0078034601fee1f8a2ef4a2ee3e4bdd 100644 (file)
--- a/bacula/src/lib/rblist.h
+++ b/bacula/src/lib/rblist.h
@@ -38,7 +38,7 @@
  */
 #ifdef HAVE_TYPEOF
 #define foreach_rblist(var, tree) \
-   for (((var)=(typeof(var))(tree)->first()); (var); ((var)=(typeof(var))(tree)->next(var)))
+   for (((var)=(TYPEOF_FUNC(var))(tree)->first()); (var); ((var)=(TYPEOF_FUNC(var))(tree)->next(var)))
 #else
 #define foreach_rblist(var, tree) \
    for ((*((void **)&(var))=(void*)((tree)->first())); (var); (*((void **)&(var))=(void*)((tree)->next(var))))