From: Aaron Marcher <info@nulltime.net>
Date: Thu, 29 Dec 2016 22:27:44 +0000 (+0100)
Subject: Merge branch 'master' into master
X-Git-Url: https://git.atheridis.org/?a=commitdiff_plain;h=015f832c3a52a7c49c0181d85ab39eec7b8489a0;p=suckless%2Fslstatus.git

Merge branch 'master' into master
---

015f832c3a52a7c49c0181d85ab39eec7b8489a0
diff --cc slstatus.c
index ac4c962,7ef9e23..46e13c9
--- a/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)
  {