[git commit] *: placate some compile warnings on OSX
Denys Vlasenko
vda.linux at googlemail.com
Thu Sep 1 09:16:22 UTC 2016
commit: https://git.busybox.net/busybox/commit/?id=ef15970d7ec904eb33ab572abc5de1f51b7e1cfa
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
networking/wget.c | 2 +-
runit/runsvdir.c | 4 ++--
shell/ash.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/networking/wget.c b/networking/wget.c
index 800ff76..8e642cb 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -1122,7 +1122,7 @@ static void download_one_url(const char *url)
/* fall through */
case 201: /* 201 Created */
/* "The request has been fulfilled and resulted in a new resource being created" */
- /* Standard wget is reported to treak this as success */
+ /* Standard wget is reported to treat this as success */
/* fall through */
case 202: /* 202 Accepted */
/* "The request has been accepted for processing, but the processing has not been completed" */
diff --git a/runit/runsvdir.c b/runit/runsvdir.c
index 2b79275..84916e9 100644
--- a/runit/runsvdir.c
+++ b/runit/runsvdir.c
@@ -181,9 +181,9 @@ static NOINLINE int do_rescan(void)
continue;
/* Do we have this service listed already? */
for (i = 0; i < svnum; i++) {
- if ((sv[i].ino == s.st_ino)
+ if (sv[i].ino == s.st_ino
#if CHECK_DEVNO_TOO
- && (sv[i].dev == s.st_dev)
+ && sv[i].dev == s.st_dev
#endif
) {
if (sv[i].pid == 0) /* restart if it has died */
diff --git a/shell/ash.c b/shell/ash.c
index 496167f..789a81c 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -13004,10 +13004,10 @@ init(void)
#endif
p = lookupvar("PWD");
if (p) {
- if (*p != '/' || stat(p, &st1) || stat(".", &st2)
+ if (p[0] != '/' || stat(p, &st1) || stat(".", &st2)
|| st1.st_dev != st2.st_dev || st1.st_ino != st2.st_ino
) {
- p = '\0';
+ p = NULL;
}
}
setpwd(p, 0);
More information about the busybox-cvs
mailing list