From: Radosław Korzeniewski <radoslaw@korzeniewski.net>
Date: Thu, 4 Mar 2021 10:12:04 +0000 (+0100)
Subject: Update typeof() usage for configured TYPEOF_FUNC.
X-Git-Tag: Release-11.3.2~681
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ab7608f1a6b9fdad042f6aebe9c8f2cdccad735;p=thirdparty%2Fbacula.git

Update typeof() usage for configured TYPEOF_FUNC.
---

diff --git a/bacula/src/lib/alist.h b/bacula/src/lib/alist.h
index 3a86867d3..96d144a2f 100644
--- 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 02cfd732f..2d2d4c20b 100644
--- 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 f53546508..599e8dd9b 100644
--- 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 203047311..3af72eda3 100644
--- 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 becd7377d..676a5019e 100644
--- 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))))