Merge branch 'master' into master

diff --cc slstatus.c
index ac4c96275edf82b60bd0d12fc80332aea7799d25,7ef9e2392eb3c96a949d3e57c44355ebb169ca02..46e13c94b7967ad776021d257379bd24259827ce
--- 1/slstatus.c
--- 2/slstatus.c
+++ b/slstatus.c
@@@ -68,9 -70,9 +69,8 @@@ static char *username(void)
  static char *vol_perc(const char *card);
  static char *wifi_perc(const char *iface);
  static char *wifi_essid(const char *iface);
- static char *kernel_release(void);
 -static void set_status(const char *str);
  static void sighandler(const int signo);
 -static void usage(void);
 +static void usage(int);
  
  char *argv0;
  char concat[];
@@@ -311,9 -313,21 +311,21 @@@ ip(const char *iface
  
        freeifaddrs(ifaddr);
  
 -      return smprintf(UNKNOWN_STR);
 +      return smprintf("%s", UNKNOWN_STR);
  }
  
+ static char *
+ kernel_release(void)
+ {
+       struct utsname udata;
+ 
+       if (uname(&udata) < 0) {
+               return smprintf(UNKNOWN_STR);
+       }
+ 
+       return smprintf("%s", udata.release);
+ }
+ 
  static char *
  load_avg(void)
  {
@@@ -737,16 -735,13 +749,6 @@@ wifi_essid(const char *iface
                return smprintf("%s", (char *)wreq.u.essid.pointer);
  }
  
- static char *
- kernel_release(void)
 -static void
 -set_status(const char *str)
--{
-       struct utsname udata;
-       if (uname(&udata) < 0)
-               return smprintf("%s", UNKNOWN_STR);
- 
-       return smprintf("%s", udata.release);
 -      XStoreName(dpy, DefaultRootWindow(dpy), str);
 -      XSync(dpy, False);
--}
--
  static void
  sighandler(const int signo)
  {