| author | Tanguy Pruvot <tanguy.pruvot@gmail.com> | 2014-05-17 15:30:48 (GMT) |
|---|---|---|
| committer | Tanguy Pruvot <tanguy.pruvot@gmail.com> | 2014-05-18 15:15:28 (GMT) |
| commit | 12e27b7992e01d2be5d04b4f1f187b1384642e98 (patch) | |
| tree | 337c249a7bd3d8f9a5049b396beee07ae2639e5d | |
| parent | d5b63cca67f555cd6e4c9b48ce5b1569620f199e (diff) | |
| download | busybox-12e27b7992e01d2be5d04b4f1f187b1384642e98.zip busybox-12e27b7992e01d2be5d04b4f1f187b1384642e98.tar.gz busybox-12e27b7992e01d2be5d04b4f1f187b1384642e98.tar.bz2 | |
bionic: some new type warnings fixes
Change-Id: I5f829e5918fb0960bb9670deac54c1fe0184550f
| -rw-r--r-- | libbb/lineedit.c | 2 | ||||
| -rw-r--r-- | procps/ps.c | 5 | ||||
| -rw-r--r-- | util-linux/volume_id/get_devname.c | 6 |
3 files changed, 9 insertions, 4 deletions
diff --git a/libbb/lineedit.c b/libbb/lineedit.c index 2fd5a9a..f897e96 100644 --- a/libbb/lineedit.c +++ b/libbb/lineedit.c @@ -1322,7 +1322,7 @@ static int get_next_history(void) /* Lists command history. Used by shell 'history' builtins */ void FAST_FUNC show_history(const line_input_t *st) { - int i; + unsigned i; if (!st) return; diff --git a/procps/ps.c b/procps/ps.c index c65fa01..ba8bc9a 100644 --- a/procps/ps.c +++ b/procps/ps.c @@ -654,8 +654,13 @@ int ps_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) OPT_l = (1 << ENABLE_SELINUX) * (1 << ENABLE_FEATURE_SHOW_THREADS) * ENABLE_FEATURE_PS_LONG, }; #if ENABLE_FEATURE_PS_LONG + #ifdef __BIONIC__ + time_t now = 0; + long uptime = 0; + #else time_t now = now; unsigned long uptime; + #endif #endif /* If we support any options, parse argv */ #if ENABLE_SELINUX || ENABLE_FEATURE_SHOW_THREADS || ENABLE_FEATURE_PS_WIDE || ENABLE_FEATURE_PS_LONG diff --git a/util-linux/volume_id/get_devname.c b/util-linux/volume_id/get_devname.c index 0c6bdfd..648dbc4 100644 --- a/util-linux/volume_id/get_devname.c +++ b/util-linux/volume_id/get_devname.c @@ -246,10 +246,10 @@ void display_uuid_cache(int scan_devices) int add_to_uuid_cache(const char *device) { - char *uuid = uuid; /* for compiler */ - char *label = label; + static char *uuid; /* for compiler */ + static char *label; #if ENABLE_FEATURE_BLKID_TYPE - const char *type = type; + static const char *type; #endif int fd; |