diff options
author | Ron Yorston <rmy@pobox.com> | 2013-08-27 16:10:53 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2013-08-27 16:10:53 +0100 |
commit | 3fd34651ea72ea1c335d3170f234cb0517fd897f (patch) | |
tree | 36e8fc40cffd464ffda4759020777dd3ca23ca31 /runit | |
parent | e3ac39098326de084a805d0dd31db9666b734f20 (diff) | |
parent | d6ae4fb446daedfe3073d67be655942e9fa7eb18 (diff) | |
download | busybox-w32-3fd34651ea72ea1c335d3170f234cb0517fd897f.tar.gz busybox-w32-3fd34651ea72ea1c335d3170f234cb0517fd897f.tar.bz2 busybox-w32-3fd34651ea72ea1c335d3170f234cb0517fd897f.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'runit')
-rw-r--r-- | runit/svlogd.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/runit/svlogd.c b/runit/svlogd.c index b7a0a6e71..8b8a6d858 100644 --- a/runit/svlogd.c +++ b/runit/svlogd.c | |||
@@ -745,11 +745,6 @@ static NOINLINE unsigned logdir_open(struct logdir *ld, const char *fn) | |||
745 | ld->inst = new; | 745 | ld->inst = new; |
746 | break; | 746 | break; |
747 | case 's': { | 747 | case 's': { |
748 | static const struct suffix_mult km_suffixes[] = { | ||
749 | { "k", 1024 }, | ||
750 | { "m", 1024*1024 }, | ||
751 | { "", 0 } | ||
752 | }; | ||
753 | ld->sizemax = xatou_sfx(&s[1], km_suffixes); | 748 | ld->sizemax = xatou_sfx(&s[1], km_suffixes); |
754 | break; | 749 | break; |
755 | } | 750 | } |