4 files changed, 32 insertions, 31 deletions

diff --git a/libbb/inet_common.c b/libbb/inet_common.c
index 9cdcb11de..6b31c79f2 100644
--- a/libbb/inet_common.c
+++ b/libbb/inet_common.c
@@ -33,19 +33,23 @@ int INET_resolve(const char *name, struct sockaddr_in *s_in, int hostfirst)
         /* If we expect this to be a hostname, try hostname database first */
 #ifdef DEBUG
         if (hostfirst) {
-                bb_error_msg("gethostbyname (%s)", name);
+                bb_error_msg("gethostbyname(%s)", name);
         }
 #endif
-        if (hostfirst && (hp = gethostbyname(name)) != (struct hostent *) NULL) {
-                memcpy((char *) &s_in->sin_addr, (char *) hp->h_addr_list[0],
-                           sizeof(struct in_addr));
-                return 0;
+        if (hostfirst) {
+                hp = gethostbyname(name);
+                if (hp != NULL) {
+                        memcpy(&s_in->sin_addr, hp->h_addr_list[0],
+                                sizeof(struct in_addr));
+                        return 0;
+                }
         }
         /* Try the NETWORKS database to see if this is a known network. */
 #ifdef DEBUG
-        bb_error_msg("getnetbyname (%s)", name);
+        bb_error_msg("getnetbyname(%s)", name);
 #endif
-        if ((np = getnetbyname(name)) != (struct netent *) NULL) {
+        np = getnetbyname(name);
+        if (np != NULL) {
                 s_in->sin_addr.s_addr = htonl(np->n_net);
                 return 1;
         }
@@ -59,14 +63,13 @@ int INET_resolve(const char *name, struct sockaddr_in *s_in, int hostfirst)
 #endif
 
 #ifdef DEBUG
-        bb_error_msg("gethostbyname (%s)", name);
+        bb_error_msg("gethostbyname(%s)", name);
 #endif
-        if ((hp = gethostbyname(name)) == (struct hostent *) NULL) {
+        hp = gethostbyname(name);
+        if (hp == NULL) {
                 return -1;
         }
-        memcpy((char *) &s_in->sin_addr, (char *) hp->h_addr_list[0],
-                   sizeof(struct in_addr));
-
+        memcpy(&s_in->sin_addr, hp->h_addr_list[0], sizeof(struct in_addr));
         return 0;
 }
 
@@ -78,7 +81,7 @@ struct addr {
         struct addr *next;
 };
 
-static struct addr *INET_nn = NULL;     /* addr-to-name cache           */
+static struct addr *INET_nn = NULL;     /* addr-to-name cache */
 
 /* numeric: & 0x8000: default instead of *,
  *          & 0x4000: host instead of net,
@@ -90,7 +93,7 @@ int INET_rresolve(char *name, size_t len, struct sockaddr_in *s_in,
         struct hostent *ent;
         struct netent *np;
         struct addr *pn;
-        unsigned long ad, host_ad;
+        uint32_t ad, host_ad;
         int host = 0;
 
         /* Grmpf. -FvK */
@@ -102,9 +105,9 @@ int INET_rresolve(char *name, size_t len, struct sockaddr_in *s_in,
                 errno = EAFNOSUPPORT;
                 return -1;
         }
-        ad = (unsigned long) s_in->sin_addr.s_addr;
+        ad = s_in->sin_addr.s_addr;
 #ifdef DEBUG
-        bb_error_msg("rresolve: %08lx, mask %08x, num %08x", ad, netmask, numeric);
+        bb_error_msg("rresolve: %08x, mask %08x, num %08x", (unsigned)ad, netmask, numeric);
 #endif
         if (ad == INADDR_ANY) {
                 if ((numeric & 0x0FFF) == 0) {
@@ -127,8 +130,8 @@ int INET_rresolve(char *name, size_t len, struct sockaddr_in *s_in,
                 if (pn->addr.sin_addr.s_addr == ad && pn->host == host) {
                         safe_strncpy(name, pn->name, len);
 #ifdef DEBUG
-                        bb_error_msg("rresolve: found %s %08lx in cache",
-                                          (host ? "host" : "net"), ad);
+                        bb_error_msg("rresolve: found %s %08x in cache",
+                                          (host ? "host" : "net"), (unsigned)ad);
 #endif
                         return 0;
                 }
@@ -140,7 +143,7 @@ int INET_rresolve(char *name, size_t len, struct sockaddr_in *s_in,
         ent = NULL;
         if (host) {
 #ifdef DEBUG
-                bb_error_msg("gethostbyaddr (%08lx)", ad);
+                bb_error_msg("gethostbyaddr (%08x)", (unsigned)ad);
 #endif
                 ent = gethostbyaddr((char *) &ad, 4, AF_INET);
                 if (ent != NULL) {
@@ -148,14 +151,14 @@ int INET_rresolve(char *name, size_t len, struct sockaddr_in *s_in,
                 }
         } else {
 #ifdef DEBUG
-                bb_error_msg("getnetbyaddr (%08lx)", host_ad);
+                bb_error_msg("getnetbyaddr (%08x)", (unsigned)host_ad);
 #endif
                 np = getnetbyaddr(host_ad, AF_INET);
                 if (np != NULL) {
                         safe_strncpy(name, np->n_name, len);
                 }
         }
-        if ((ent == NULL) && (np == NULL)) {
+        if (!ent && !np) {
                 safe_strncpy(name, inet_ntoa(s_in->sin_addr), len);
         }
         pn = xmalloc(sizeof(struct addr));
@@ -164,7 +167,6 @@ int INET_rresolve(char *name, size_t len, struct sockaddr_in *s_in,
         pn->host = host;
         pn->name = xstrdup(name);
         INET_nn = pn;
-
         return 0;
 }
 
@@ -183,9 +185,7 @@ int INET6_resolve(const char *name, struct sockaddr_in6 *sin6)
                 return -1;
         }
         memcpy(sin6, ai->ai_addr, sizeof(struct sockaddr_in6));
-
         freeaddrinfo(ai);
-
         return 0;
 }
 
@@ -224,7 +224,8 @@ int INET6_rresolve(char *name, size_t len, struct sockaddr_in6 *sin6,
                 return 0;
         }
 
-        s = getnameinfo((struct sockaddr *) sin6, sizeof(struct sockaddr_in6), name, len, NULL, 0, 0);
+        s = getnameinfo((struct sockaddr *) sin6, sizeof(struct sockaddr_in6),
+                                name, len, NULL, 0, 0);
         if (s) {
                 bb_error_msg("getnameinfo failed");
                 return -1;
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 2c849eb74..08dab26f0 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -1254,8 +1254,6 @@ static void win_changed(int nsig)
 
 int read_line_input(const char* prompt, char* command, int maxsize, line_input_t *st)
 {
-        static const int null_flags;
-
         int lastWasTab = FALSE;
         unsigned int ic;
         unsigned char c;
@@ -1270,7 +1268,7 @@ int read_line_input(const char* prompt, char* command, int maxsize, line_input_t
                 maxsize = BUFSIZ;
 
         /* With null flags, no other fields are ever used */
-        state = st ? st : (line_input_t*) &null_flags;
+        state = st ? st : (line_input_t*) &const_int_0;
         if (state->flags & SAVE_HISTORY)
                 load_history(state->hist_file);
 
diff --git a/libbb/messages.c b/libbb/messages.c
index 6c3d2f608..105e4ce66 100644
--- a/libbb/messages.c
+++ b/libbb/messages.c
@@ -40,6 +40,9 @@ const char bb_path_motd_file[] = "/etc/motd";
 const char bb_default_login_shell[] = LIBBB_DEFAULT_LOGIN_SHELL;
 const char bb_dev_null[] = "/dev/null";
 
+const int const_int_0;
+const int const_int_1 = 1;
+
 #include <utmp.h>
 /* This is usually something like "/var/adm/wtmp" or "/var/log/wtmp" */
 const char bb_path_wtmp_file[] =
diff --git a/libbb/xconnect.c b/libbb/xconnect.c
index 62cab95a1..0addda157 100644
--- a/libbb/xconnect.c
+++ b/libbb/xconnect.c
@@ -9,14 +9,13 @@
 #include <netinet/in.h>
 #include "libbb.h"
 
-static const int one = 1;
 int setsockopt_reuseaddr(int fd)
 {
-        return setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one));
+        return setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &const_int_1, sizeof(const_int_1));
 }
 int setsockopt_broadcast(int fd)
 {
-        return setsockopt(fd, SOL_SOCKET, SO_BROADCAST, &one, sizeof(one));
+        return setsockopt(fd, SOL_SOCKET, SO_BROADCAST, &const_int_1, sizeof(const_int_1));
 }
 
 void xconnect(int s, const struct sockaddr *s_addr, socklen_t addrlen)