diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-04-11 17:04:29 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-04-11 17:04:29 +0000 |
commit | 6398cf477d96cea03459835ed7462d2e8d5b2a71 (patch) | |
tree | b1ffb40817fcb6a50e970ca9ef33624c56bd3a2a | |
parent | e4f2d064b0fcffc8897089e1c80e6e2d61b6805d (diff) | |
download | busybox-w32-6398cf477d96cea03459835ed7462d2e8d5b2a71.tar.gz busybox-w32-6398cf477d96cea03459835ed7462d2e8d5b2a71.tar.bz2 busybox-w32-6398cf477d96cea03459835ed7462d2e8d5b2a71.zip |
style fixes, no code changes.
-rw-r--r-- | e2fsprogs/old_e2fsprogs/e2fsck.c | 2 | ||||
-rw-r--r-- | modutils/insmod.c | 58 | ||||
-rw-r--r-- | modutils/modprobe.c | 4 | ||||
-rw-r--r-- | networking/traceroute.c | 2 | ||||
-rw-r--r-- | shell/hush.c | 2 | ||||
-rw-r--r-- | shell/lash.c | 2 |
6 files changed, 37 insertions, 33 deletions
diff --git a/e2fsprogs/old_e2fsprogs/e2fsck.c b/e2fsprogs/old_e2fsprogs/e2fsck.c index bb9f42a4b..44ae11734 100644 --- a/e2fsprogs/old_e2fsprogs/e2fsck.c +++ b/e2fsprogs/old_e2fsprogs/e2fsck.c | |||
@@ -12660,7 +12660,7 @@ static void check_mount(e2fsck_t ctx) | |||
12660 | cont = ask_yn(_("Do you really want to continue"), -1); | 12660 | cont = ask_yn(_("Do you really want to continue"), -1); |
12661 | if (!cont) { | 12661 | if (!cont) { |
12662 | printf(_("check aborted.\n")); | 12662 | printf(_("check aborted.\n")); |
12663 | exit (0); | 12663 | exit(0); |
12664 | } | 12664 | } |
12665 | } | 12665 | } |
12666 | 12666 | ||
diff --git a/modutils/insmod.c b/modutils/insmod.c index 7d5cf473c..50b5dd18e 100644 --- a/modutils/insmod.c +++ b/modutils/insmod.c | |||
@@ -598,7 +598,7 @@ static unsigned long obj_elf_hash(const char *); | |||
598 | 598 | ||
599 | static unsigned long obj_elf_hash_n(const char *, unsigned long len); | 599 | static unsigned long obj_elf_hash_n(const char *, unsigned long len); |
600 | 600 | ||
601 | static struct obj_symbol *obj_find_symbol (struct obj_file *f, | 601 | static struct obj_symbol *obj_find_symbol(struct obj_file *f, |
602 | const char *name); | 602 | const char *name); |
603 | 603 | ||
604 | static ElfW(Addr) obj_symbol_final_value(struct obj_file *f, | 604 | static ElfW(Addr) obj_symbol_final_value(struct obj_file *f, |
@@ -610,23 +610,23 @@ static void obj_set_symbol_compare(struct obj_file *f, | |||
610 | unsigned long (*hash)(const char *)); | 610 | unsigned long (*hash)(const char *)); |
611 | #endif | 611 | #endif |
612 | 612 | ||
613 | static struct obj_section *obj_find_section (struct obj_file *f, | 613 | static struct obj_section *obj_find_section(struct obj_file *f, |
614 | const char *name); | 614 | const char *name); |
615 | 615 | ||
616 | static void obj_insert_section_load_order (struct obj_file *f, | 616 | static void obj_insert_section_load_order(struct obj_file *f, |
617 | struct obj_section *sec); | 617 | struct obj_section *sec); |
618 | 618 | ||
619 | static struct obj_section *obj_create_alloced_section (struct obj_file *f, | 619 | static struct obj_section *obj_create_alloced_section(struct obj_file *f, |
620 | const char *name, | 620 | const char *name, |
621 | unsigned long align, | 621 | unsigned long align, |
622 | unsigned long size); | 622 | unsigned long size); |
623 | 623 | ||
624 | static struct obj_section *obj_create_alloced_section_first (struct obj_file *f, | 624 | static struct obj_section *obj_create_alloced_section_first(struct obj_file *f, |
625 | const char *name, | 625 | const char *name, |
626 | unsigned long align, | 626 | unsigned long align, |
627 | unsigned long size); | 627 | unsigned long size); |
628 | 628 | ||
629 | static void *obj_extend_section (struct obj_section *sec, unsigned long more); | 629 | static void *obj_extend_section(struct obj_section *sec, unsigned long more); |
630 | 630 | ||
631 | static int obj_string_patch(struct obj_file *f, int secidx, ElfW(Addr) offset, | 631 | static int obj_string_patch(struct obj_file *f, int secidx, ElfW(Addr) offset, |
632 | const char *string); | 632 | const char *string); |
@@ -638,29 +638,29 @@ static int obj_check_undefineds(struct obj_file *f); | |||
638 | 638 | ||
639 | static void obj_allocate_commons(struct obj_file *f); | 639 | static void obj_allocate_commons(struct obj_file *f); |
640 | 640 | ||
641 | static unsigned long obj_load_size (struct obj_file *f); | 641 | static unsigned long obj_load_size(struct obj_file *f); |
642 | 642 | ||
643 | static int obj_relocate (struct obj_file *f, ElfW(Addr) base); | 643 | static int obj_relocate(struct obj_file *f, ElfW(Addr) base); |
644 | 644 | ||
645 | static struct obj_file *obj_load(FILE *f, int loadprogbits); | 645 | static struct obj_file *obj_load(FILE *f, int loadprogbits); |
646 | 646 | ||
647 | static int obj_create_image (struct obj_file *f, char *image); | 647 | static int obj_create_image(struct obj_file *f, char *image); |
648 | 648 | ||
649 | /* Architecture specific manipulation routines. */ | 649 | /* Architecture specific manipulation routines. */ |
650 | 650 | ||
651 | static struct obj_file *arch_new_file (void); | 651 | static struct obj_file *arch_new_file(void); |
652 | 652 | ||
653 | static struct obj_section *arch_new_section (void); | 653 | static struct obj_section *arch_new_section(void); |
654 | 654 | ||
655 | static struct obj_symbol *arch_new_symbol (void); | 655 | static struct obj_symbol *arch_new_symbol(void); |
656 | 656 | ||
657 | static enum obj_reloc arch_apply_relocation (struct obj_file *f, | 657 | static enum obj_reloc arch_apply_relocation(struct obj_file *f, |
658 | struct obj_section *targsec, | 658 | struct obj_section *targsec, |
659 | struct obj_section *symsec, | 659 | struct obj_section *symsec, |
660 | struct obj_symbol *sym, | 660 | struct obj_symbol *sym, |
661 | ElfW(RelM) *rel, ElfW(Addr) value); | 661 | ElfW(RelM) *rel, ElfW(Addr) value); |
662 | 662 | ||
663 | static void arch_create_got (struct obj_file *f); | 663 | static void arch_create_got(struct obj_file *f); |
664 | #if ENABLE_FEATURE_CHECK_TAINTED_MODULE | 664 | #if ENABLE_FEATURE_CHECK_TAINTED_MODULE |
665 | static int obj_gpl_license(struct obj_file *f, const char **license); | 665 | static int obj_gpl_license(struct obj_file *f, const char **license); |
666 | #endif /* FEATURE_CHECK_TAINTED_MODULE */ | 666 | #endif /* FEATURE_CHECK_TAINTED_MODULE */ |
@@ -2313,13 +2313,13 @@ add_symbols_from( struct obj_file *f, | |||
2313 | kernel exports `C names', but module object files | 2313 | kernel exports `C names', but module object files |
2314 | reference `linker names'). */ | 2314 | reference `linker names'). */ |
2315 | size_t extra = sizeof SYMBOL_PREFIX; | 2315 | size_t extra = sizeof SYMBOL_PREFIX; |
2316 | size_t name_size = strlen (name) + extra; | 2316 | size_t name_size = strlen(name) + extra; |
2317 | if (name_size > name_alloced_size) { | 2317 | if (name_size > name_alloced_size) { |
2318 | name_alloced_size = name_size * 2; | 2318 | name_alloced_size = name_size * 2; |
2319 | name_buf = alloca (name_alloced_size); | 2319 | name_buf = alloca(name_alloced_size); |
2320 | } | 2320 | } |
2321 | strcpy (name_buf, SYMBOL_PREFIX); | 2321 | strcpy(name_buf, SYMBOL_PREFIX); |
2322 | strcpy (name_buf + extra - 1, name); | 2322 | strcpy(name_buf + extra - 1, name); |
2323 | name = name_buf; | 2323 | name = name_buf; |
2324 | #endif /* SYMBOL_PREFIX */ | 2324 | #endif /* SYMBOL_PREFIX */ |
2325 | 2325 | ||
@@ -2327,8 +2327,8 @@ add_symbols_from( struct obj_file *f, | |||
2327 | if (sym && !(ELF_ST_BIND(sym->info) == STB_LOCAL)) { | 2327 | if (sym && !(ELF_ST_BIND(sym->info) == STB_LOCAL)) { |
2328 | #ifdef SYMBOL_PREFIX | 2328 | #ifdef SYMBOL_PREFIX |
2329 | /* Put NAME_BUF into more permanent storage. */ | 2329 | /* Put NAME_BUF into more permanent storage. */ |
2330 | name = xmalloc (name_size); | 2330 | name = xmalloc(name_size); |
2331 | strcpy (name, name_buf); | 2331 | strcpy(name, name_buf); |
2332 | #endif | 2332 | #endif |
2333 | sym = obj_add_symbol(f, name, -1, | 2333 | sym = obj_add_symbol(f, name, -1, |
2334 | ELF_ST_INFO(STB_GLOBAL, | 2334 | ELF_ST_INFO(STB_GLOBAL, |
@@ -2351,10 +2351,14 @@ static void add_kernel_symbols(struct obj_file *f) | |||
2351 | 2351 | ||
2352 | /* Add module symbols first. */ | 2352 | /* Add module symbols first. */ |
2353 | 2353 | ||
2354 | for (i = 0, m = ext_modules; i < n_ext_modules; ++i, ++m) | 2354 | for (i = 0, m = ext_modules; i < n_ext_modules; ++i, ++m) { |
2355 | if (m->nsyms | 2355 | if (m->nsyms |
2356 | && add_symbols_from(f, SHN_HIRESERVE + 2 + i, m->syms, | 2356 | && add_symbols_from(f, SHN_HIRESERVE + 2 + i, m->syms, m->nsyms) |
2357 | m->nsyms)) m->used = 1, ++nused; | 2357 | ) { |
2358 | m->used = 1; | ||
2359 | ++nused; | ||
2360 | } | ||
2361 | } | ||
2358 | 2362 | ||
2359 | n_ext_modules_used = nused; | 2363 | n_ext_modules_used = nused; |
2360 | 2364 | ||
@@ -2423,9 +2427,9 @@ new_process_module_arguments(struct obj_file *f, int argc, char **argv) | |||
2423 | } | 2427 | } |
2424 | 2428 | ||
2425 | #ifdef SYMBOL_PREFIX | 2429 | #ifdef SYMBOL_PREFIX |
2426 | sym_name = alloca (strlen (key) + sizeof SYMBOL_PREFIX); | 2430 | sym_name = alloca(strlen(key) + sizeof SYMBOL_PREFIX); |
2427 | strcpy (sym_name, SYMBOL_PREFIX); | 2431 | strcpy(sym_name, SYMBOL_PREFIX); |
2428 | strcat (sym_name, key); | 2432 | strcat(sym_name, key); |
2429 | #else | 2433 | #else |
2430 | sym_name = key; | 2434 | sym_name = key; |
2431 | #endif | 2435 | #endif |
@@ -2549,7 +2553,7 @@ new_process_module_arguments(struct obj_file *f, int argc, char **argv) | |||
2549 | obj_string_patch(f, sym->secidx, loc - contents, str); | 2553 | obj_string_patch(f, sym->secidx, loc - contents, str); |
2550 | loc += tgt_sizeof_char_p; | 2554 | loc += tgt_sizeof_char_p; |
2551 | } else { | 2555 | } else { |
2552 | /* Array of chars (in fact, matrix !) */ | 2556 | /* Array of chars (in fact, matrix!) */ |
2553 | unsigned long charssize; /* size of each member */ | 2557 | unsigned long charssize; /* size of each member */ |
2554 | 2558 | ||
2555 | /* Get the size of each member */ | 2559 | /* Get the size of each member */ |
diff --git a/modutils/modprobe.c b/modutils/modprobe.c index 09494ca5f..d6a9553d5 100644 --- a/modutils/modprobe.c +++ b/modutils/modprobe.c | |||
@@ -677,8 +677,8 @@ static int check_pattern(const char* pat_src, const char* mod_src) { | |||
677 | char* mod; | 677 | char* mod; |
678 | char* p; | 678 | char* p; |
679 | 679 | ||
680 | pat = xstrdup (pat_src); | 680 | pat = xstrdup(pat_src); |
681 | mod = xstrdup (mod_src); | 681 | mod = xstrdup(mod_src); |
682 | 682 | ||
683 | for (p = pat; (p = strchr(p, '-')); *p++ = '_'); | 683 | for (p = pat; (p = strchr(p, '-')); *p++ = '_'); |
684 | for (p = mod; (p = strchr(p, '-')); *p++ = '_'); | 684 | for (p = mod; (p = strchr(p, '-')); *p++ = '_'); |
diff --git a/networking/traceroute.c b/networking/traceroute.c index 33023e74f..cdc48ea5e 100644 --- a/networking/traceroute.c +++ b/networking/traceroute.c | |||
@@ -856,7 +856,7 @@ print(unsigned char *buf, int cc, struct sockaddr_in *from) | |||
856 | inetname(from); | 856 | inetname(from); |
857 | #if ENABLE_FEATURE_TRACEROUTE_VERBOSE | 857 | #if ENABLE_FEATURE_TRACEROUTE_VERBOSE |
858 | if (verbose) | 858 | if (verbose) |
859 | printf(" %d bytes to %s", cc, inet_ntoa (ip->ip_dst)); | 859 | printf(" %d bytes to %s", cc, inet_ntoa(ip->ip_dst)); |
860 | #endif | 860 | #endif |
861 | } | 861 | } |
862 | 862 | ||
diff --git a/shell/hush.c b/shell/hush.c index 3048d695a..331d591c8 100644 --- a/shell/hush.c +++ b/shell/hush.c | |||
@@ -489,7 +489,7 @@ static int builtin_exit(struct child_prog *child) | |||
489 | { | 489 | { |
490 | if (child->argv[1] == NULL) | 490 | if (child->argv[1] == NULL) |
491 | exit(last_return_code); | 491 | exit(last_return_code); |
492 | exit (atoi(child->argv[1])); | 492 | exit(atoi(child->argv[1])); |
493 | } | 493 | } |
494 | 494 | ||
495 | /* built-in 'export VAR=value' handler */ | 495 | /* built-in 'export VAR=value' handler */ |
diff --git a/shell/lash.c b/shell/lash.c index f91bec254..aba9c0a2e 100644 --- a/shell/lash.c +++ b/shell/lash.c | |||
@@ -243,7 +243,7 @@ static int builtin_exit(struct child_prog *child) | |||
243 | if (child->argv[1] == NULL) | 243 | if (child->argv[1] == NULL) |
244 | exit(EXIT_SUCCESS); | 244 | exit(EXIT_SUCCESS); |
245 | 245 | ||
246 | exit (atoi(child->argv[1])); | 246 | exit(atoi(child->argv[1])); |
247 | } | 247 | } |
248 | 248 | ||
249 | /* built-in 'fg' and 'bg' handler */ | 249 | /* built-in 'fg' and 'bg' handler */ |