diff options
author | vapier <vapier@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-03-28 02:35:56 +0000 |
---|---|---|
committer | vapier <vapier@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-03-28 02:35:56 +0000 |
commit | 519d297d182020c3d57d2c65e6d83faf5410cfe1 (patch) | |
tree | c772f878f5a0b613fe65d48cb8dda0225d250d5e | |
parent | ecf4c1d755182cb7f93fc608bddc058a9dc7c074 (diff) | |
download | busybox-w32-519d297d182020c3d57d2c65e6d83faf5410cfe1.tar.gz busybox-w32-519d297d182020c3d57d2c65e6d83faf5410cfe1.tar.bz2 busybox-w32-519d297d182020c3d57d2c65e6d83faf5410cfe1.zip |
just whitespace fixes
git-svn-id: svn://busybox.net/trunk/busybox@14676 69ca8d6d-28ef-0310-b511-8ec308f3f277
-rw-r--r-- | e2fsprogs/ext2fs/bb_inode.c | 2 | ||||
-rw-r--r-- | e2fsprogs/ext2fs/block.c | 2 | ||||
-rw-r--r-- | e2fsprogs/ext2fs/flushb.c | 4 | ||||
-rw-r--r-- | e2fsprogs/ext2fs/get_pathname.c | 2 | ||||
-rw-r--r-- | e2fsprogs/ext2fs/ismounted.c | 2 | ||||
-rw-r--r-- | e2fsprogs/ext2fs/link.c | 2 | ||||
-rw-r--r-- | e2fsprogs/ext2fs/lookup.c | 2 | ||||
-rw-r--r-- | e2fsprogs/ext2fs/read_bb.c | 2 | ||||
-rw-r--r-- | e2fsprogs/ext2fs/unlink.c | 2 | ||||
-rw-r--r-- | include/platform.h | 32 | ||||
-rw-r--r-- | libbb/sha1.c | 14 |
11 files changed, 33 insertions, 33 deletions
diff --git a/e2fsprogs/ext2fs/bb_inode.c b/e2fsprogs/ext2fs/bb_inode.c index 9af117d8f..8a840d9d7 100644 --- a/e2fsprogs/ext2fs/bb_inode.c +++ b/e2fsprogs/ext2fs/bb_inode.c | |||
@@ -147,7 +147,7 @@ cleanup: | |||
147 | * indirect blocks. | 147 | * indirect blocks. |
148 | */ | 148 | */ |
149 | #ifdef __TURBOC__ | 149 | #ifdef __TURBOC__ |
150 | #pragma argsused | 150 | # pragma argsused |
151 | #endif | 151 | #endif |
152 | static int clear_bad_block_proc(ext2_filsys fs, blk_t *block_nr, | 152 | static int clear_bad_block_proc(ext2_filsys fs, blk_t *block_nr, |
153 | e2_blkcnt_t blockcnt, | 153 | e2_blkcnt_t blockcnt, |
diff --git a/e2fsprogs/ext2fs/block.c b/e2fsprogs/ext2fs/block.c index 18be2a5e8..94e96c5c4 100644 --- a/e2fsprogs/ext2fs/block.c +++ b/e2fsprogs/ext2fs/block.c | |||
@@ -404,7 +404,7 @@ struct xlate { | |||
404 | }; | 404 | }; |
405 | 405 | ||
406 | #ifdef __TURBOC__ | 406 | #ifdef __TURBOC__ |
407 | #pragma argsused | 407 | # pragma argsused |
408 | #endif | 408 | #endif |
409 | static int xlate_func(ext2_filsys fs, blk_t *blocknr, e2_blkcnt_t blockcnt, | 409 | static int xlate_func(ext2_filsys fs, blk_t *blocknr, e2_blkcnt_t blockcnt, |
410 | blk_t ref_block EXT2FS_ATTR((unused)), | 410 | blk_t ref_block EXT2FS_ATTR((unused)), |
diff --git a/e2fsprogs/ext2fs/flushb.c b/e2fsprogs/ext2fs/flushb.c index 9f04647ec..af7216a91 100644 --- a/e2fsprogs/ext2fs/flushb.c +++ b/e2fsprogs/ext2fs/flushb.c | |||
@@ -67,14 +67,14 @@ errcode_t ext2fs_sync_device(int fd, int flushb) | |||
67 | return 0; | 67 | return 0; |
68 | #else | 68 | #else |
69 | #ifdef __GNUC__ | 69 | #ifdef __GNUC__ |
70 | #warning BLKFLSBUF not defined | 70 | # warning BLKFLSBUF not defined |
71 | #endif /* __GNUC__ */ | 71 | #endif /* __GNUC__ */ |
72 | #endif | 72 | #endif |
73 | #ifdef FDFLUSH | 73 | #ifdef FDFLUSH |
74 | ioctl (fd, FDFLUSH, 0); /* In case this is a floppy */ | 74 | ioctl (fd, FDFLUSH, 0); /* In case this is a floppy */ |
75 | #else | 75 | #else |
76 | #ifdef __GNUC__ | 76 | #ifdef __GNUC__ |
77 | #warning FDFLUSH not defined | 77 | # warning FDFLUSH not defined |
78 | #endif /* __GNUC__ */ | 78 | #endif /* __GNUC__ */ |
79 | #endif | 79 | #endif |
80 | } | 80 | } |
diff --git a/e2fsprogs/ext2fs/get_pathname.c b/e2fsprogs/ext2fs/get_pathname.c index 000479096..18bb6d271 100644 --- a/e2fsprogs/ext2fs/get_pathname.c +++ b/e2fsprogs/ext2fs/get_pathname.c | |||
@@ -35,7 +35,7 @@ struct get_pathname_struct { | |||
35 | }; | 35 | }; |
36 | 36 | ||
37 | #ifdef __TURBOC__ | 37 | #ifdef __TURBOC__ |
38 | #pragma argsused | 38 | # pragma argsused |
39 | #endif | 39 | #endif |
40 | static int get_pathname_proc(struct ext2_dir_entry *dirent, | 40 | static int get_pathname_proc(struct ext2_dir_entry *dirent, |
41 | int offset EXT2FS_ATTR((unused)), | 41 | int offset EXT2FS_ATTR((unused)), |
diff --git a/e2fsprogs/ext2fs/ismounted.c b/e2fsprogs/ext2fs/ismounted.c index 125fe244b..381194320 100644 --- a/e2fsprogs/ext2fs/ismounted.c +++ b/e2fsprogs/ext2fs/ismounted.c | |||
@@ -284,7 +284,7 @@ static int is_swap_device(const char *file) | |||
284 | * characters. | 284 | * characters. |
285 | */ | 285 | */ |
286 | #ifdef __TURBOC__ | 286 | #ifdef __TURBOC__ |
287 | #pragma argsused | 287 | # pragma argsused |
288 | #endif | 288 | #endif |
289 | errcode_t ext2fs_check_mount_point(const char *device, int *mount_flags, | 289 | errcode_t ext2fs_check_mount_point(const char *device, int *mount_flags, |
290 | char *mtpt, int mtlen) | 290 | char *mtpt, int mtlen) |
diff --git a/e2fsprogs/ext2fs/link.c b/e2fsprogs/ext2fs/link.c index 281ad065f..6fb307638 100644 --- a/e2fsprogs/ext2fs/link.c +++ b/e2fsprogs/ext2fs/link.c | |||
@@ -92,7 +92,7 @@ static int link_proc(struct ext2_dir_entry *dirent, | |||
92 | * entry filetype. | 92 | * entry filetype. |
93 | */ | 93 | */ |
94 | #ifdef __TURBOC__ | 94 | #ifdef __TURBOC__ |
95 | #pragma argsused | 95 | # pragma argsused |
96 | #endif | 96 | #endif |
97 | errcode_t ext2fs_link(ext2_filsys fs, ext2_ino_t dir, const char *name, | 97 | errcode_t ext2fs_link(ext2_filsys fs, ext2_ino_t dir, const char *name, |
98 | ext2_ino_t ino, int flags) | 98 | ext2_ino_t ino, int flags) |
diff --git a/e2fsprogs/ext2fs/lookup.c b/e2fsprogs/ext2fs/lookup.c index 9cb97f1b5..76c5ac871 100644 --- a/e2fsprogs/ext2fs/lookup.c +++ b/e2fsprogs/ext2fs/lookup.c | |||
@@ -26,7 +26,7 @@ struct lookup_struct { | |||
26 | }; | 26 | }; |
27 | 27 | ||
28 | #ifdef __TURBOC__ | 28 | #ifdef __TURBOC__ |
29 | #pragma argsused | 29 | # pragma argsused |
30 | #endif | 30 | #endif |
31 | static int lookup_proc(struct ext2_dir_entry *dirent, | 31 | static int lookup_proc(struct ext2_dir_entry *dirent, |
32 | int offset EXT2FS_ATTR((unused)), | 32 | int offset EXT2FS_ATTR((unused)), |
diff --git a/e2fsprogs/ext2fs/read_bb.c b/e2fsprogs/ext2fs/read_bb.c index 226c5375a..7612e674f 100644 --- a/e2fsprogs/ext2fs/read_bb.c +++ b/e2fsprogs/ext2fs/read_bb.c | |||
@@ -35,7 +35,7 @@ struct read_bb_record { | |||
35 | * Helper function for ext2fs_read_bb_inode() | 35 | * Helper function for ext2fs_read_bb_inode() |
36 | */ | 36 | */ |
37 | #ifdef __TURBOC__ | 37 | #ifdef __TURBOC__ |
38 | #pragma argsused | 38 | # pragma argsused |
39 | #endif | 39 | #endif |
40 | static int mark_bad_block(ext2_filsys fs, blk_t *block_nr, | 40 | static int mark_bad_block(ext2_filsys fs, blk_t *block_nr, |
41 | e2_blkcnt_t blockcnt EXT2FS_ATTR((unused)), | 41 | e2_blkcnt_t blockcnt EXT2FS_ATTR((unused)), |
diff --git a/e2fsprogs/ext2fs/unlink.c b/e2fsprogs/ext2fs/unlink.c index a6ab53ae8..6ad3c4e3a 100644 --- a/e2fsprogs/ext2fs/unlink.c +++ b/e2fsprogs/ext2fs/unlink.c | |||
@@ -28,7 +28,7 @@ struct link_struct { | |||
28 | }; | 28 | }; |
29 | 29 | ||
30 | #ifdef __TURBOC__ | 30 | #ifdef __TURBOC__ |
31 | #pragma argsused | 31 | # pragma argsused |
32 | #endif | 32 | #endif |
33 | static int unlink_proc(struct ext2_dir_entry *dirent, | 33 | static int unlink_proc(struct ext2_dir_entry *dirent, |
34 | int offset EXT2FS_ATTR((unused)), | 34 | int offset EXT2FS_ATTR((unused)), |
diff --git a/include/platform.h b/include/platform.h index 699de8f02..ea2983d30 100644 --- a/include/platform.h +++ b/include/platform.h | |||
@@ -44,28 +44,28 @@ | |||
44 | #endif | 44 | #endif |
45 | 45 | ||
46 | #ifndef ATTRIBUTE_UNUSED | 46 | #ifndef ATTRIBUTE_UNUSED |
47 | #define ATTRIBUTE_UNUSED __attribute__ ((__unused__)) | 47 | # define ATTRIBUTE_UNUSED __attribute__ ((__unused__)) |
48 | #endif /* ATTRIBUTE_UNUSED */ | 48 | #endif /* ATTRIBUTE_UNUSED */ |
49 | 49 | ||
50 | #ifndef ATTRIBUTE_NORETURN | 50 | #ifndef ATTRIBUTE_NORETURN |
51 | #define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__)) | 51 | # define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__)) |
52 | #endif /* ATTRIBUTE_NORETURN */ | 52 | #endif /* ATTRIBUTE_NORETURN */ |
53 | 53 | ||
54 | #ifndef ATTRIBUTE_PACKED | 54 | #ifndef ATTRIBUTE_PACKED |
55 | #define ATTRIBUTE_PACKED __attribute__ ((__packed__)) | 55 | # define ATTRIBUTE_PACKED __attribute__ ((__packed__)) |
56 | #endif /* ATTRIBUTE_PACKED */ | 56 | #endif /* ATTRIBUTE_PACKED */ |
57 | 57 | ||
58 | #ifndef ATTRIBUTE_ALIGNED | 58 | #ifndef ATTRIBUTE_ALIGNED |
59 | #define ATTRIBUTE_ALIGNED(m) __attribute__ ((__aligned__(m))) | 59 | # define ATTRIBUTE_ALIGNED(m) __attribute__ ((__aligned__(m))) |
60 | #endif /* ATTRIBUTE_ALIGNED */ | 60 | #endif /* ATTRIBUTE_ALIGNED */ |
61 | 61 | ||
62 | /* -fwhole-program makes all symbols local. The attribute externally_visible | 62 | /* -fwhole-program makes all symbols local. The attribute externally_visible |
63 | forces a symbol global. */ | 63 | forces a symbol global. */ |
64 | #ifndef ATTRIBUTE_EXTERNALLY_VISIBLE | 64 | #ifndef ATTRIBUTE_EXTERNALLY_VISIBLE |
65 | # if __GNUC_PREREQ (4,1) | 65 | # if __GNUC_PREREQ (4,1) |
66 | # define ATTRIBUTE_EXTERNALLY_VISIBLE __attribute__ ((__externally_visible__)) | 66 | # define ATTRIBUTE_EXTERNALLY_VISIBLE __attribute__ ((__externally_visible__)) |
67 | # else | 67 | # else |
68 | # define ATTRIBUTE_EXTERNALLY_VISIBLE | 68 | # define ATTRIBUTE_EXTERNALLY_VISIBLE |
69 | # endif /* GNUC >= 4.1 */ | 69 | # endif /* GNUC >= 4.1 */ |
70 | #endif /* ATTRIBUTE_EXTERNALLY_VISIBLE */ | 70 | #endif /* ATTRIBUTE_EXTERNALLY_VISIBLE */ |
71 | 71 | ||
@@ -80,26 +80,26 @@ | |||
80 | 80 | ||
81 | /* ---- Endian Detection ------------------------------------ */ | 81 | /* ---- Endian Detection ------------------------------------ */ |
82 | #ifndef __APPLE__ | 82 | #ifndef __APPLE__ |
83 | #include <byteswap.h> | 83 | # include <byteswap.h> |
84 | #include <endian.h> | 84 | # include <endian.h> |
85 | #endif | 85 | #endif |
86 | 86 | ||
87 | #ifdef __BIG_ENDIAN__ | 87 | #ifdef __BIG_ENDIAN__ |
88 | #define BB_BIG_ENDIAN 1 | 88 | # define BB_BIG_ENDIAN 1 |
89 | #define BB_LITTLE_ENDIAN 0 | 89 | # define BB_LITTLE_ENDIAN 0 |
90 | #elif __BYTE_ORDER == __BIG_ENDIAN | 90 | #elif __BYTE_ORDER == __BIG_ENDIAN |
91 | #define BB_BIG_ENDIAN 1 | 91 | # define BB_BIG_ENDIAN 1 |
92 | #define BB_LITTLE_ENDIAN 0 | 92 | # define BB_LITTLE_ENDIAN 0 |
93 | #else | 93 | #else |
94 | #define BB_BIG_ENDIAN 0 | 94 | # define BB_BIG_ENDIAN 0 |
95 | #define BB_LITTLE_ENDIAN 1 | 95 | # define BB_LITTLE_ENDIAN 1 |
96 | #endif | 96 | #endif |
97 | 97 | ||
98 | /* ---- Networking ------------------------------------------ */ | 98 | /* ---- Networking ------------------------------------------ */ |
99 | #ifndef __APPLE__ | 99 | #ifndef __APPLE__ |
100 | #include <arpa/inet.h> | 100 | # include <arpa/inet.h> |
101 | #else | 101 | #else |
102 | #include <netinet/in.h> | 102 | # include <netinet/in.h> |
103 | #endif | 103 | #endif |
104 | 104 | ||
105 | /* ---- miscellaneous --------------------------------------- */ | 105 | /* ---- miscellaneous --------------------------------------- */ |
diff --git a/libbb/sha1.c b/libbb/sha1.c index f0d952f84..128d4b98f 100644 --- a/libbb/sha1.c +++ b/libbb/sha1.c | |||
@@ -147,13 +147,13 @@ void sha1_hash(const void *data, size_t length, sha1_ctx_t *ctx) | |||
147 | void *sha1_end(void *resbuf, sha1_ctx_t *ctx) | 147 | void *sha1_end(void *resbuf, sha1_ctx_t *ctx) |
148 | { | 148 | { |
149 | /* SHA1 Final padding and digest calculation */ | 149 | /* SHA1 Final padding and digest calculation */ |
150 | #if BB_BIG_ENDIAN | 150 | #if BB_BIG_ENDIAN |
151 | static uint32_t mask[4] = { 0x00000000, 0xff000000, 0xffff0000, 0xffffff00 }; | 151 | static uint32_t mask[4] = { 0x00000000, 0xff000000, 0xffff0000, 0xffffff00 }; |
152 | static uint32_t bits[4] = { 0x80000000, 0x00800000, 0x00008000, 0x00000080 }; | 152 | static uint32_t bits[4] = { 0x80000000, 0x00800000, 0x00008000, 0x00000080 }; |
153 | #else | 153 | #else |
154 | static uint32_t mask[4] = { 0x00000000, 0x000000ff, 0x0000ffff, 0x00ffffff }; | 154 | static uint32_t mask[4] = { 0x00000000, 0x000000ff, 0x0000ffff, 0x00ffffff }; |
155 | static uint32_t bits[4] = { 0x00000080, 0x00008000, 0x00800000, 0x80000000 }; | 155 | static uint32_t bits[4] = { 0x00000080, 0x00008000, 0x00800000, 0x80000000 }; |
156 | #endif /* __BYTE_ORDER */ | 156 | #endif /* __BYTE_ORDER */ |
157 | 157 | ||
158 | uint8_t *hval = resbuf; | 158 | uint8_t *hval = resbuf; |
159 | uint32_t i, cnt = (uint32_t) (ctx->count[0] & SHA1_MASK); | 159 | uint32_t i, cnt = (uint32_t) (ctx->count[0] & SHA1_MASK); |