Xinqi Bao's Git
projects
/
slstatus.git
/ diff
summary
|
log
|
commit
|
diff
|
tree
raw
|
patch
|
inline
| side by side (parent:
1a14356
)
kernel_release() coding style and position in code fix
author
Aaron Marcher <
[email protected]
>
Wed, 28 Dec 2016 22:59:19 +0000
(23:59 +0100)
committer
Aaron Marcher <
[email protected]
>
Wed, 28 Dec 2016 22:59:19 +0000
(23:59 +0100)
slstatus.c
diff
|
blob
|
history
diff --git
a/slstatus.c
b/slstatus.c
index
2b63be4
..
7ef9e23
100644
(file)
--- a/
slstatus.c
+++ b/
slstatus.c
@@
-52,6
+52,7
@@
static char *entropy(void);
static char *gid(void);
static char *hostname(void);
static char *ip(const char *iface);
static char *gid(void);
static char *hostname(void);
static char *ip(const char *iface);
+static char *kernel_release(void);
static char *load_avg(void);
static char *ram_free(void);
static char *ram_perc(void);
static char *load_avg(void);
static char *ram_free(void);
static char *ram_perc(void);
@@
-69,7
+70,6
@@
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 *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 set_status(const char *str);
static void sighandler(const int signo);
static void usage(void);
@@
-316,6
+316,18
@@
ip(const char *iface)
return smprintf(UNKNOWN_STR);
}
return smprintf(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)
{
static char *
load_avg(void)
{
@@
-723,16
+735,6
@@
wifi_essid(const char *iface)
return smprintf("%s", (char *)wreq.u.essid.pointer);
}
return smprintf("%s", (char *)wreq.u.essid.pointer);
}
-static char *
-kernel_release(void)
-{
- struct utsname udata;
- if (uname(&udata) < 0)
- return smprintf(UNKNOWN_STR);
-
- return smprintf("%s", udata.release);
-}
-
static void
set_status(const char *str)
{
static void
set_status(const char *str)
{