- Correct compiler complaints in wx-console and tray-monitor.

[bacula/bacula] / bacula / src / lib / address_conf.c

diff --git a/bacula/src/lib/address_conf.c b/bacula/src/lib/address_conf.c
index 3b692025d849d534c2dee855ed957245e767b8d4..81fe37a800b05f8042f268d6e81f90269b240d81 100644 (file)
--- a/bacula/src/lib/address_conf.c
+++ b/bacula/src/lib/address_conf.c
@@ -200,14 +200,14 @@ const char *IPADDR::build_address_str(char *buf, int blen)
 {
    char tmp[1024];
    bsnprintf(buf, blen, "host[%s:%s:%hu] ",
-           get_family() == AF_INET ? "ipv4" : "ipv6",
+            get_family() == AF_INET ? "ipv4" : "ipv6",
            get_address(tmp, sizeof(tmp) - 1), get_port_host_order());
    return buf;
 }
 
 const char *build_addresses_str(dlist *addrs, char *buf, int blen)
 {
-   if (addrs->size() == 0) {
+   if (!addrs || addrs->size() == 0) {
       bstrncpy(buf, "", blen);
       return buf;
    }
@@ -231,12 +231,20 @@ const char *get_first_address(dlist * addrs, char *outputbuf, int outlen)
 
 int get_first_port_net_order(dlist * addrs)
 {
-   return ((IPADDR *)(addrs->first()))->get_port_net_order();
+   if (!addrs) {
+      return 0;
+   } else {
+      return ((IPADDR *)(addrs->first()))->get_port_net_order();
+   }
 }
 
 int get_first_port_host_order(dlist * addrs)
 {
-   return ((IPADDR *)(addrs->first()))->get_port_host_order();
+   if (!addrs) {
+      return 0;
+   } else {
+      return ((IPADDR *)(addrs->first()))->get_port_host_order();
+   }
 }
 
 void init_default_addresses(dlist **out, int port)
@@ -274,7 +282,7 @@ static int add_address(dlist **out, IPADDR::i_type type, unsigned short defaultp
         } else if (iaddr->get_type() != type) {
            *errstr = (char *)malloc(1024);
            bsnprintf(*errstr, 1023,
-                     "the old style addresses cannot be mixed with new style");
+                      "the old style addresses cannot be mixed with new style");
            return 0;
         }
       }
@@ -292,12 +300,12 @@ static int add_address(dlist **out, IPADDR::i_type type, unsigned short defaultp
       if (0 < pnum && pnum < 0xffff) {
         port = htons(pnum);
       } else {
-        struct servent *s = getservbyname(port_str, "tcp");
+         struct servent *s = getservbyname(port_str, "tcp");
         if (s) {
            port = s->s_port;
         } else {
            *errstr = (char *)malloc(1024);
-           bsnprintf(*errstr, 1023, "can't resolve service(%s)", port_str);
+            bsnprintf(*errstr, 1023, "can't resolve service(%s)", port_str);
            return 0;
         }
       }
@@ -405,7 +413,7 @@ void store_addresses(LEX * lc, RES_ITEM * item, int index, int pass)
    }
    do {
       if (!(token == T_UNQUOTED_STRING || token == T_IDENTIFIER)) {
-        scan_err1(lc, _("Expected a string, got: %s"), lc->str);
+         scan_err1(lc, _("Expected a string, got: %s"), lc->str);
       }
       if (strcasecmp("ip", lc->str) == 0 || strcasecmp("ipv4", lc->str) == 0) {
         family = AF_INET;
@@ -414,46 +422,46 @@ void store_addresses(LEX * lc, RES_ITEM * item, int index, int pass)
       else if (strcasecmp("ipv6", lc->str) == 0) {
         family = AF_INET6;
       } else {
-        scan_err1(lc, _("Expected a string [ip|ipv4|ipv6], got: %s"), lc->str);
+         scan_err1(lc, _("Expected a string [ip|ipv4|ipv6], got: %s"), lc->str);
       }
 #else
       else {
-        scan_err1(lc, _("Expected a string [ip|ipv4], got: %s"), lc->str);
+         scan_err1(lc, _("Expected a string [ip|ipv4], got: %s"), lc->str);
       }
 #endif
       token = lex_get_token(lc, T_SKIP_EOL);
       if (token != T_EQUALS) {
-        scan_err1(lc, _("Expected a equal =, got: %s"), lc->str);
+         scan_err1(lc, _("Expected a equal =, got: %s"), lc->str);
       }
       token = lex_get_token(lc, T_SKIP_EOL);
       if (token != T_BOB) {
-        scan_err1(lc, _("Expected a block beginn { , got: %s"), lc->str);
+         scan_err1(lc, _("Expected a block beginn { , got: %s"), lc->str);
       }
       token = lex_get_token(lc, T_SKIP_EOL);
       exist = EMPTYLINE;
       port_str[0] = hostname_str[0] = '\0';
       do {
         if (token != T_IDENTIFIER) {
-           scan_err1(lc, _("Expected a identifier [addr|port], got: %s"), lc->str);
+            scan_err1(lc, _("Expected a identifier [addr|port], got: %s"), lc->str);
         }
-        if (strcasecmp("port", lc->str) == 0) {
+         if (strcasecmp("port", lc->str) == 0) {
            next_line = PORTLINE;
            if (exist & PORTLINE) {
-              scan_err0(lc, _("Only one port per address block"));
+               scan_err0(lc, _("Only one port per address block"));
            }
            exist |= PORTLINE;
-        } else if (strcasecmp("addr", lc->str) == 0) {
+         } else if (strcasecmp("addr", lc->str) == 0) {
            next_line = ADDRLINE;
            if (exist & ADDRLINE) {
-              scan_err0(lc, _("Only one addr per address block"));
+               scan_err0(lc, _("Only one addr per address block"));
            }
            exist |= ADDRLINE;
         } else {
-           scan_err1(lc, _("Expected a identifier [addr|port], got: %s"), lc->str);
+            scan_err1(lc, _("Expected a identifier [addr|port], got: %s"), lc->str);
         }
         token = lex_get_token(lc, T_SKIP_EOL);
         if (token != T_EQUALS) {
-           scan_err1(lc, _("Expected a equal =, got: %s"), lc->str);
+            scan_err1(lc, _("Expected a equal =, got: %s"), lc->str);
         }
         token = lex_get_token(lc, T_SKIP_EOL);
         switch (next_line) {
@@ -461,31 +469,31 @@ void store_addresses(LEX * lc, RES_ITEM * item, int index, int pass)
            if (!
                (token == T_UNQUOTED_STRING || token == T_NUMBER
                 || token == T_IDENTIFIER)) {
-              scan_err1(lc, _("Expected a number or a string, got: %s"), lc->str);
+               scan_err1(lc, _("Expected a number or a string, got: %s"), lc->str);
            }
            bstrncpy(port_str, lc->str, sizeof(port_str));
            break;
         case ADDRLINE:
            if (!(token == T_UNQUOTED_STRING || token == T_IDENTIFIER)) {
-              scan_err1(lc, _("Expected an IP number or a hostname, got: %s"),
+               scan_err1(lc, _("Expected an IP number or a hostname, got: %s"),
                         lc->str);
            }
            bstrncpy(hostname_str, lc->str, sizeof(hostname_str));
            break;
         case EMPTYLINE:
-           scan_err0(lc, _("State machine missmatch"));
+            scan_err0(lc, _("State machine missmatch"));
            break;
         }
         token = lex_get_token(lc, T_SKIP_EOL);
       } while (token == T_IDENTIFIER);
       if (token != T_EOB) {
-        scan_err1(lc, _("Expected a end of block }, got: %s"), lc->str);
+         scan_err1(lc, _("Expected a end of block }, got: %s"), lc->str);
       }
 
       char *errstr;
       if (pass == 1 && !add_address((dlist **)(item->value), IPADDR::R_MULTIPLE,
               htons(item->default_value), family, hostname_str, port_str, &errstr)) {
-          scan_err3(lc, _("Can't add hostname(%s) and port(%s) to addrlist (%s)"),
+           scan_err3(lc, _("Can't add hostname(%s) and port(%s) to addrlist (%s)"),
                   hostname_str, port_str, errstr);
           free(errstr);
        }
@@ -572,7 +580,7 @@ char *sockaddr_to_ascii(const struct sockaddr *sa, char *buf, int len)
                 (void*)&(((struct sockaddr_in*)sa)->sin_addr) :
                 (void*)&(((struct sockaddr_in6*)sa)->sin6_addr),
 # else
-                (void*)&(((struct sockaddr_in*)sa)->sin_addr) :
+                (void*)&(((struct sockaddr_in*)sa)->sin_addr),
 # endif /* HAVE_IPV6 */
             buf, len);
 #else