diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-02-01 23:48:27 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-02-01 23:48:27 +0100 |
| commit | 40e7d25aca1abbe080e00e2bed64b444a5ec7858 (patch) | |
| tree | 05cda08f66542aeb94d1ebb906a0f04b04a41d62 /include | |
| parent | 4875e7148b0512ee3c255526a484503da984935a (diff) | |
| download | busybox-w32-40e7d25aca1abbe080e00e2bed64b444a5ec7858.tar.gz busybox-w32-40e7d25aca1abbe080e00e2bed64b444a5ec7858.tar.bz2 busybox-w32-40e7d25aca1abbe080e00e2bed64b444a5ec7858.zip | |
mkXXXX: unify [KBYTES] parameter handling (added it to mkswap)
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/libbb.h | 5 | ||||
| -rw-r--r-- | include/usage.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/libbb.h b/include/libbb.h index a86d64400..09852d036 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
| @@ -412,6 +412,11 @@ int rename_or_warn(const char *oldpath, const char *newpath) FAST_FUNC; | |||
| 412 | off_t xlseek(int fd, off_t offset, int whence) FAST_FUNC; | 412 | off_t xlseek(int fd, off_t offset, int whence) FAST_FUNC; |
| 413 | off_t fdlength(int fd) FAST_FUNC; | 413 | off_t fdlength(int fd) FAST_FUNC; |
| 414 | 414 | ||
| 415 | uoff_t FAST_FUNC get_volume_size_in_bytes(int fd, | ||
| 416 | const char *override, | ||
| 417 | unsigned override_units, | ||
| 418 | int extend); | ||
| 419 | |||
| 415 | void xpipe(int filedes[2]) FAST_FUNC; | 420 | void xpipe(int filedes[2]) FAST_FUNC; |
| 416 | /* In this form code with pipes is much more readable */ | 421 | /* In this form code with pipes is much more readable */ |
| 417 | struct fd_pair { int rd; int wr; }; | 422 | struct fd_pair { int rd; int wr; }; |
diff --git a/include/usage.h b/include/usage.h index 44cc83422..683d53fbd 100644 --- a/include/usage.h +++ b/include/usage.h | |||
| @@ -2844,7 +2844,7 @@ | |||
| 2844 | "$ mknod -m 644 /tmp/pipe p\n" | 2844 | "$ mknod -m 644 /tmp/pipe p\n" |
| 2845 | 2845 | ||
| 2846 | #define mkswap_trivial_usage \ | 2846 | #define mkswap_trivial_usage \ |
| 2847 | "[OPTIONS] BLOCKDEV" /* [SIZE_IN_KB] */ | 2847 | "[OPTIONS] BLOCKDEV [KBYTES]" |
| 2848 | #define mkswap_full_usage "\n\n" \ | 2848 | #define mkswap_full_usage "\n\n" \ |
| 2849 | "Prepare BLOCKDEV to be used as swap partition\n" \ | 2849 | "Prepare BLOCKDEV to be used as swap partition\n" \ |
| 2850 | "\nOptions:" \ | 2850 | "\nOptions:" \ |
