diff options
| author | Lauri Kasanen | 2010-07-04 00:04:03 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2010-07-04 00:04:03 +0200 |
| commit | 7c1b2b5420d4208864b8bc6e07e90792aed94981 (patch) | |
| tree | c2c94e95289de30c85495a91b9615cab394beaf3 | |
| parent | 5c296de390b1329a6243d12a86ef9c4726ace22a (diff) | |
| download | busybox-7c1b2b5420d4208864b8bc6e07e90792aed94981.zip busybox-7c1b2b5420d4208864b8bc6e07e90792aed94981.tar.gz | |
losetup: use LOOP_foo defines
Signed-off-by: Lauri Kasanen <curaga@operamail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | include/libbb.h | 12 | ||||
| -rw-r--r-- | util-linux/losetup.c | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/libbb.h b/include/libbb.h index 53b768d..e260017 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -1606,18 +1606,18 @@ extern const char bb_default_login_shell[]; # define VC_3 "/dev/vc/3" # define VC_4 "/dev/vc/4" # define VC_5 "/dev/vc/5" -#if defined(__sh__) || defined(__H8300H__) || defined(__H8300S__) +# if defined(__sh__) || defined(__H8300H__) || defined(__H8300S__) /* Yes, this sucks, but both SH (including sh64) and H8 have a SCI(F) for their respective serial ports .. as such, we can't use the common device paths for these. -- PFM */ # define SC_0 "/dev/ttsc/0" # define SC_1 "/dev/ttsc/1" # define SC_FORMAT "/dev/ttsc/%d" -#else +# else # define SC_0 "/dev/tts/0" # define SC_1 "/dev/tts/1" # define SC_FORMAT "/dev/tts/%d" -#endif +# endif # define VC_FORMAT "/dev/vc/%d" # define LOOP_FORMAT "/dev/loop/%d" # define LOOP_NAMESIZE (sizeof("/dev/loop/") + sizeof(int)*3 + 1) @@ -1630,15 +1630,15 @@ extern const char bb_default_login_shell[]; # define VC_3 "/dev/tty3" # define VC_4 "/dev/tty4" # define VC_5 "/dev/tty5" -#if defined(__sh__) || defined(__H8300H__) || defined(__H8300S__) +# if defined(__sh__) || defined(__H8300H__) || defined(__H8300S__) # define SC_0 "/dev/ttySC0" # define SC_1 "/dev/ttySC1" # define SC_FORMAT "/dev/ttySC%d" -#else +# else # define SC_0 "/dev/ttyS0" # define SC_1 "/dev/ttyS1" # define SC_FORMAT "/dev/ttyS%d" -#endif +# endif # define VC_FORMAT "/dev/tty%d" # define LOOP_FORMAT "/dev/loop%d" # define LOOP_NAMESIZE (sizeof("/dev/loop") + sizeof(int)*3 + 1) diff --git a/util-linux/losetup.c b/util-linux/losetup.c index 0f5914c..3873be3 100644 --- a/util-linux/losetup.c +++ b/util-linux/losetup.c @@ -65,9 +65,9 @@ int losetup_main(int argc UNUSED_PARAM, char **argv) n = 0; while (1) { char *s; - char dev[sizeof(LOOP_NAME) + sizeof(int)*3]; + char dev[LOOP_NAMESIZE]; - sprintf(dev, LOOP_NAME"%u", n); + sprintf(dev, LOOP_FORMAT, n); s = query_loop(dev); n++; if (!s) { |