Clean some style and stop using %m (use %s + strerror (errno) instead)

diff --git a/client.c b/client.c
index 8a6530b8f84615881a682c7d91dc053d42df4772..87f8ee3d5b104349ad5fcabb6a548d047c1475c2 100644 (file)
--- a/client.c
+++ b/client.c
@@ -105,7 +105,8 @@ unsigned long random_xid (void)
       fd = open ("/dev/urandom", 0);
       if (fd < 0 || read (fd,  &seed, sizeof(seed)) < 0)
        {
-         logger (LOG_WARNING, "Could not load seed from /dev/urandom: %m");
+         logger (LOG_WARNING, "Could not load seed from /dev/urandom: %s",
+                 strerror (errno));
          seed = time (0);
        }
       if (fd >= 0)

diff --git a/common.c b/common.c
index c3203b9c5ab697067e8addde63405ffcbeafb6d5..9288def4af5145bab6aef4909a40834453d825ae 100644 (file)
--- a/common.c
+++ b/common.c
@@ -20,6 +20,7 @@
  */
 
 #include <sys/time.h>
+#include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -43,7 +44,7 @@ long uptime (void)
 
   if (clock_gettime(CLOCK_MONOTONIC, &tp) == -1)
     {
-      logger (LOG_ERR, "Unable to get uptime: %m");
+      logger (LOG_ERR, "Unable to get uptime: %s", strerror (errno));
       return -1;
     }
 

diff --git a/configure.c b/configure.c
index a70859a52dc998accd68154c19e1f07a61491dcd..9121f5a5b0b868a7b24b6afb6015d5ffb611f592 100644 (file)
--- a/configure.c
+++ b/configure.c
@@ -47,7 +47,7 @@
 
 static char *cleanmetas (char *cstr)
 {
-  if (!cstr)
+  if (! cstr)
     return "";
   
   register char *c = cstr;
@@ -62,13 +62,13 @@ static char *cleanmetas (char *cstr)
 
 void exec_script (char *script, char *infofile, char *arg)
 {
-  if (!script || !infofile || !arg)
+  if (! script || ! infofile || ! arg)
     return;
 
   struct stat buf;
-  if (stat (script, &buf))
+  if (stat (script, &buf) < 0)
     {
-      if (strcmp (script, DEFAULT_SCRIPT))
+      if (strcmp (script, DEFAULT_SCRIPT) != 0)
        logger (LOG_ERR, "`%s': %s", script, strerror (ENOENT));
       return;
     }
@@ -88,8 +88,8 @@ void exec_script (char *script, char *infofile, char *arg)
   if ((pid = fork ()) == 0)
     {
       if (execv (script, argc))
-       logger (LOG_ERR, "error executing \"%s %s %s\": %m",
-               argc[0], argc[1], argc[2]);
+       logger (LOG_ERR, "error executing \"%s %s %s\": %s",
+               argc[0], argc[1], argc[2], strerror (errno));
       exit (0);
     }
   else if (pid == -1)
@@ -103,19 +103,19 @@ static int make_resolv (char *ifname, dhcp_t *dhcp, int wait)
   char resolvconf[PATH_MAX];
   address_t *address;
 
-  if (!stat ("/sbin/resolvconf", &buf))
+  if (stat ("/sbin/resolvconf", &buf) == 0)
     {
       logger (LOG_DEBUG, "sending DNS information to resolvconf");
       snprintf (resolvconf, PATH_MAX, "/sbin/resolvconf -a %s", ifname);
       f = popen (resolvconf, "w");
 
-      if (!f)
-       logger (LOG_ERR, "popen: %m");
+      if (! f)
+       logger (LOG_ERR, "popen: %s", strerror (errno));
     }
   else
     {
       if (! (f = fopen(RESOLVFILE, "w")))
-       logger (LOG_ERR, "fopen `%s': %m", RESOLVFILE);
+       logger (LOG_ERR, "fopen `%s': %s", RESOLVFILE, strerror (errno));
     }
 
   if (f) 
@@ -150,7 +150,7 @@ static void restore_resolv(char *ifname)
 {
   struct stat buf;
 
-  if (stat ("/sbin/resolvconf", &buf))
+  if (stat ("/sbin/resolvconf", &buf) < 0)
     return;
 
   logger (LOG_DEBUG, "removing information from resolvconf");
@@ -171,8 +171,8 @@ static void restore_resolv(char *ifname)
   if ((pid = fork ()) == 0)
     {
       if (execve (argc[0], argc, NULL))
-       logger (LOG_ERR, "error executing \"%s %s %s\": %m",
-               argc[0], argc[1], argc[2]);
+       logger (LOG_ERR, "error executing \"%s %s %s\": %s",
+               argc[0], argc[1], argc[2], strerror (errno));
       exit (0);
     }
   else if (pid == -1)
@@ -187,7 +187,7 @@ static int make_ntp (char *ifname, dhcp_t *dhcp)
 
   if (! (f = fopen(NTPFILE, "w")))
     {
-      logger (LOG_ERR, "fopen `%s': %m", NTPFILE);
+      logger (LOG_ERR, "fopen `%s': %s", NTPFILE, strerror (errno));
       return -1;
     }
          
@@ -215,7 +215,7 @@ static int make_nis (char *ifname, dhcp_t *dhcp)
 
   if (! (f = fopen(NISFILE, "w")))
     {
-      logger (LOG_ERR, "fopen `%s': %m", NISFILE);
+      logger (LOG_ERR, "fopen `%s': %s", NISFILE, strerror (errno));
       return -1;
     }
 
@@ -248,7 +248,7 @@ static int write_info(interface_t *iface, dhcp_t *dhcp)
 
   if ((f = fopen (iface->infofile, "w")) == NULL)
     {
-      logger (LOG_ERR, "fopen `%s': %m", iface->infofile);
+      logger (LOG_ERR, "fopen `%s': %s", iface->infofile, strerror (errno));
       return -1;
     }
 
@@ -356,7 +356,7 @@ int configure (options_t *options, interface_t *iface, dhcp_t *dhcp)
   char *dname = NULL;
   int dnamel = 0;
  
-  if (!options || !iface || !dhcp)
+  if (! options || ! iface || ! dhcp)
     return -1;
 
   /* Remove old routes

diff --git a/dhcpcd.c b/dhcpcd.c
index b1e2ef6a3c85d41a28a14058088abeeffb50f92a..712622ade795fa29a404dd3ce872b7b281318987 100644 (file)
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -355,14 +355,14 @@ int main(int argc, char **argv)
   if (mkdir (CONFIGDIR, S_IRUSR |S_IWUSR |S_IXUSR | S_IRGRP | S_IXGRP
             | S_IROTH | S_IXOTH) && errno != EEXIST )
     {
-      logger (LOG_ERR, "mkdir(\"%s\",0): %m\n", CONFIGDIR);
+      logger (LOG_ERR, "mkdir(\"%s\",0): %s\n", CONFIGDIR, strerror (errno));
       exit (EXIT_FAILURE);
     }
 
   if (mkdir (ETCDIR, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP
             | S_IROTH | S_IXOTH) && errno != EEXIST )
     {
-      logger (LOG_ERR, "mkdir(\"%s\",0): %m\n", ETCDIR);
+      logger (LOG_ERR, "mkdir(\"%s\",0): %s\n", ETCDIR, strerror (errno));
       exit (EXIT_FAILURE);
     }