From: Meno Abels <meno.abels@adviser.com>
Date: Thu, 19 Aug 2004 18:39:51 +0000 (+0000)
Subject: Just a namechange. The cause is the suncc
X-Git-Tag: Release-1.35.2~28
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=067d6158fb48066e2c69dccf05480209e112326e;p=bacula%2Fbacula

Just a namechange. The cause is the suncc
said that a member that is named buf hides a method
parameter buf.


git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1545 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/src/lib/address_conf.c b/bacula/src/lib/address_conf.c
index 1b5fcb4ed9..8c03b774d8 100644
--- a/bacula/src/lib/address_conf.c
+++ b/bacula/src/lib/address_conf.c
@@ -34,11 +34,11 @@ static int add_address(dlist **out, IPADDR::i_type type, unsigned short defaultp
 
 IPADDR::IPADDR(const IPADDR &src) : type(src.type)
 {
-  memcpy(&buf, &src.buf, sizeof(buf));
-  saddr  = &buf.dontuse;
-  saddr4 = &buf.dontuse4; 
+  memcpy(&saddrbuf, &src.saddrbuf, sizeof(saddrbuf));
+  saddr  = &saddrbuf.dontuse;
+  saddr4 = &saddrbuf.dontuse4; 
 #ifdef HAVE_IPV6
-  saddr6 = &buf.dontuse6;
+  saddr6 = &saddrbuf.dontuse6;
 #endif
 }
 
@@ -47,10 +47,10 @@ IPADDR::IPADDR(int af) : type(R_EMPTY)
   if (!(af  == AF_INET6 || af  == AF_INET)) {
      Emsg1(M_ERROR_TERM, 0, _("Only ipv4 and ipv6 are supported(%d)\n"), af);
   }
-  saddr  = &buf.dontuse;
-  saddr4 = &buf.dontuse4; 
+  saddr  = &saddrbuf.dontuse;
+  saddr4 = &saddrbuf.dontuse4; 
 #ifdef HAVE_IPV6
-  saddr6 = &buf.dontuse6;
+  saddr6 = &saddrbuf.dontuse6;
 #endif
   saddr->sa_family = af;
   if (af  == AF_INET) {
diff --git a/bacula/src/lib/address_conf.h b/bacula/src/lib/address_conf.h
index 27df19ed9d..9f618da1c5 100644
--- a/bacula/src/lib/address_conf.h
+++ b/bacula/src/lib/address_conf.h
@@ -27,7 +27,6 @@
 
 
 class IPADDR : public SMARTALLOC {
-// class IPADDR {
  public:
    typedef enum { R_SINGLE, R_SINGLE_PORT, R_SINGLE_ADDR, R_MULTIPLE,
                   R_DEFAULT, R_EMPTY
@@ -43,7 +42,7 @@ class IPADDR : public SMARTALLOC {
 #ifdef HAVE_IPV6
       struct sockaddr_in6 dontuse6;
 #endif
-   } buf;
+   } saddrbuf;
    struct sockaddr *saddr;
    struct sockaddr_in *saddr4;
 #ifdef HAVE_IPV6