aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-09-27 14:06:06 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-09-27 14:06:06 +0000
commitbb04506dc8bfdc92511b1cc0872e946ebe1ac087 (patch)
tree77bc1bff460002de2e64759208b90dff0a6e313b
parentd6855d1b5043089fc606f7e62679babb68c7cbb4 (diff)
downloadbusybox-w32-bb04506dc8bfdc92511b1cc0872e946ebe1ac087.tar.gz
busybox-w32-bb04506dc8bfdc92511b1cc0872e946ebe1ac087.tar.bz2
busybox-w32-bb04506dc8bfdc92511b1cc0872e946ebe1ac087.zip
more style fixes, no code changes
-rw-r--r--e2fsprogs/old_e2fsprogs/e2fsck.c12
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/dirhash.c2
-rw-r--r--e2fsprogs/old_e2fsprogs/fsck.c30
3 files changed, 22 insertions, 22 deletions
diff --git a/e2fsprogs/old_e2fsprogs/e2fsck.c b/e2fsprogs/old_e2fsprogs/e2fsck.c
index 7cb1227db..61a30f487 100644
--- a/e2fsprogs/old_e2fsprogs/e2fsck.c
+++ b/e2fsprogs/old_e2fsprogs/e2fsck.c
@@ -192,10 +192,10 @@ struct buffer_head {
192#define K_DEV_FS 1 192#define K_DEV_FS 1
193#define K_DEV_JOURNAL 2 193#define K_DEV_JOURNAL 2
194 194
195#define lock_buffer(bh) do {} while(0) 195#define lock_buffer(bh) do {} while (0)
196#define unlock_buffer(bh) do {} while(0) 196#define unlock_buffer(bh) do {} while (0)
197#define buffer_req(bh) 1 197#define buffer_req(bh) 1
198#define do_readahead(journal, start) do {} while(0) 198#define do_readahead(journal, start) do {} while (0)
199 199
200static e2fsck_t e2fsck_global_ctx; /* Try your very best not to use this! */ 200static e2fsck_t e2fsck_global_ctx; /* Try your very best not to use this! */
201 201
@@ -10014,7 +10014,7 @@ static int do_one_pass(journal_t *journal,
10014 * all of the sequence number checks. What are we going 10014 * all of the sequence number checks. What are we going
10015 * to do with it? That depends on the pass... */ 10015 * to do with it? That depends on the pass... */
10016 10016
10017 switch(blocktype) { 10017 switch (blocktype) {
10018 case JFS_DESCRIPTOR_BLOCK: 10018 case JFS_DESCRIPTOR_BLOCK:
10019 /* If it is a valid descriptor block, replay it 10019 /* If it is a valid descriptor block, replay it
10020 * in pass REPLAY; otherwise, just skip over the 10020 * in pass REPLAY; otherwise, just skip over the
@@ -11158,7 +11158,7 @@ int journal_init_revoke(journal_t *journal, int hash_size)
11158 11158
11159 shift = 0; 11159 shift = 0;
11160 tmp = hash_size; 11160 tmp = hash_size;
11161 while((tmp >>= 1UL) != 0UL) 11161 while ((tmp >>= 1UL) != 0UL)
11162 shift++; 11162 shift++;
11163 journal->j_revoke->hash_shift = shift; 11163 journal->j_revoke->hash_shift = shift;
11164 11164
@@ -12251,7 +12251,7 @@ static int read_a_char(void)
12251 int r; 12251 int r;
12252 int fail = 0; 12252 int fail = 0;
12253 12253
12254 while(1) { 12254 while (1) {
12255 if (e2fsck_global_ctx && 12255 if (e2fsck_global_ctx &&
12256 (e2fsck_global_ctx->flags & E2F_FLAG_CANCEL)) { 12256 (e2fsck_global_ctx->flags & E2F_FLAG_CANCEL)) {
12257 return 3; 12257 return 3;
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/dirhash.c b/e2fsprogs/old_e2fsprogs/ext2fs/dirhash.c
index ab3243fd7..09e34be3b 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/dirhash.c
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/dirhash.c
@@ -42,7 +42,7 @@ static void TEA_transform(__u32 buf[4], __u32 const in[])
42 sum += DELTA; 42 sum += DELTA;
43 b0 += ((b1 << 4)+a) ^ (b1+sum) ^ ((b1 >> 5)+b); 43 b0 += ((b1 << 4)+a) ^ (b1+sum) ^ ((b1 >> 5)+b);
44 b1 += ((b0 << 4)+c) ^ (b0+sum) ^ ((b0 >> 5)+d); 44 b1 += ((b0 << 4)+c) ^ (b0+sum) ^ ((b0 >> 5)+d);
45 } while(--n); 45 } while (--n);
46 46
47 buf[0] += b0; 47 buf[0] += b0;
48 buf[1] += b1; 48 buf[1] += b1;
diff --git a/e2fsprogs/old_e2fsprogs/fsck.c b/e2fsprogs/old_e2fsprogs/fsck.c
index 9cb9f754d..cc273536f 100644
--- a/e2fsprogs/old_e2fsprogs/fsck.c
+++ b/e2fsprogs/old_e2fsprogs/fsck.c
@@ -533,21 +533,21 @@ static struct fs_info *lookup(char *filesys)
533/* Find fsck program for a given fs type. */ 533/* Find fsck program for a given fs type. */
534static char *find_fsck(char *type) 534static char *find_fsck(char *type)
535{ 535{
536 char *s; 536 char *s;
537 const char *tpl; 537 const char *tpl;
538 char *p = string_copy(fsck_path); 538 char *p = string_copy(fsck_path);
539 struct stat st; 539 struct stat st;
540 540
541 /* Are we looking for a program or just a type? */ 541 /* Are we looking for a program or just a type? */
542 tpl = (strncmp(type, "fsck.", 5) ? "%s/fsck.%s" : "%s/%s"); 542 tpl = (strncmp(type, "fsck.", 5) ? "%s/fsck.%s" : "%s/%s");
543 543
544 for(s = strtok(p, ":"); s; s = strtok(NULL, ":")) { 544 for (s = strtok(p, ":"); s; s = strtok(NULL, ":")) {
545 s = xasprintf(tpl, s, type); 545 s = xasprintf(tpl, s, type);
546 if (stat(s, &st) == 0) break; 546 if (stat(s, &st) == 0) break;
547 free(s); 547 free(s);
548 } 548 }
549 free(p); 549 free(p);
550 return s; 550 return s;
551} 551}
552 552
553static int progress_active(void) 553static int progress_active(void)
@@ -885,7 +885,7 @@ static void compile_fs_type(char *fs_type, struct fs_type_compile *cmp)
885 list = string_copy(fs_type); 885 list = string_copy(fs_type);
886 num = 0; 886 num = 0;
887 s = strtok(list, ","); 887 s = strtok(list, ",");
888 while(s) { 888 while (s) {
889 negate = 0; 889 negate = 0;
890 if (strncmp(s, "no", 2) == 0) { 890 if (strncmp(s, "no", 2) == 0) {
891 s += 2; 891 s += 2;
@@ -930,7 +930,7 @@ static int opt_in_list(char *opt, char *optlist)
930 list = string_copy(optlist); 930 list = string_copy(optlist);
931 931
932 s = strtok(list, ","); 932 s = strtok(list, ",");
933 while(s) { 933 while (s) {
934 if (strcmp(s, opt) == 0) { 934 if (strcmp(s, opt) == 0) {
935 free(list); 935 free(list);
936 return 1; 936 return 1;