Rename struct var to fix AIX build

Fixing issue #15580 by renaming struct var to tool_var to avoid conflict
with the same structure name defined in AIX system headers.

Fixes #15580
Closes #15581

diff --git a/src/tool_cfgable.h b/src/tool_cfgable.h
index 09ea9edd19f2c97ab6ef6e0d0abb13f2bf361000..ae59a9bf672dc2293acdd588b2e354f650e0a0b0 100644 (file)
--- a/src/tool_cfgable.h
+++ b/src/tool_cfgable.h
@@ -337,7 +337,7 @@ struct GlobalConfig {
   unsigned short parallel_max; /* MAX_PARALLEL is the maximum */
   bool parallel_connect;
   char *help_category;            /* The help category, if set */
-  struct var *variables;
+  struct tool_var *variables;
   struct OperationConfig *first;
   struct OperationConfig *current;
   struct OperationConfig *last;   /* Always last in the struct */

diff --git a/src/var.c b/src/var.c
index 35d631ff0e515324815036e7e44bcdb3810d772b..348c7707d64cc458e6ad053c645df9091c880526 100644 (file)
--- a/src/var.c
+++ b/src/var.c
@@ -56,19 +56,19 @@ static char *Memdup(const char *data, size_t len)
 /* free everything */
 void varcleanup(struct GlobalConfig *global)
 {
-  struct var *list = global->variables;
+  struct tool_var *list = global->variables;
   while(list) {
-    struct var *t = list;
+    struct tool_var *t = list;
     list = list->next;
     free((char *)t->content);
     free(t);
   }
 }
 
-static const struct var *varcontent(struct GlobalConfig *global,
-                                    const char *name, size_t nlen)
+static const struct tool_var *varcontent(struct GlobalConfig *global,
+                                         const char *name, size_t nlen)
 {
-  struct var *list = global->variables;
+  struct tool_var *list = global->variables;
   while(list) {
     if((strlen(list->name) == nlen) &&
        !strncmp(name, list->name, nlen)) {
@@ -285,7 +285,7 @@ ParameterError varexpand(struct GlobalConfig *global,
           char *value;
           size_t vlen = 0;
           struct curlx_dynbuf buf;
-          const struct var *v = varcontent(global, name, nlen);
+          const struct tool_var *v = varcontent(global, name, nlen);
           if(v) {
             value = (char *)v->content;
             vlen = v->clen;
@@ -351,13 +351,13 @@ static ParameterError addvariable(struct GlobalConfig *global,
                                   size_t clen,
                                   bool contalloc)
 {
-  struct var *p;
-  const struct var *check = varcontent(global, name, nlen);
+  struct tool_var *p;
+  const struct tool_var *check = varcontent(global, name, nlen);
   DEBUGASSERT(nlen);
   if(check)
     notef(global, "Overwriting variable '%s'", check->name);
 
-  p = calloc(1, sizeof(struct var) + nlen);
+  p = calloc(1, sizeof(struct tool_var) + nlen);
   if(p) {
     memcpy(p->name, name, nlen);
 

diff --git a/src/var.h b/src/var.h
index 2ea9797275a43500b4251a3c28796362c6bd80c7..5af6c1f4dd10ae4f84960db4bb430e0101335ae1 100644 (file)
--- a/src/var.h
+++ b/src/var.h
@@ -27,8 +27,8 @@
 #include "tool_getparam.h"
 #include "dynbuf.h"
 
-struct var {
-  struct var *next;
+struct tool_var {
+  struct tool_var *next;
   const char *content;
   size_t clen; /* content length */
   char name[1]; /* allocated as part of the struct */