svn commit: trunk/busybox: e2fsprogs/old_e2fsprogs modutils network etc...
vda at busybox.net
vda at busybox.net
Wed Apr 11 17:04:30 UTC 2007
Author: vda
Date: 2007-04-11 10:04:29 -0700 (Wed, 11 Apr 2007)
New Revision: 18403
Log:
style fixes, no code changes.
Modified:
trunk/busybox/e2fsprogs/old_e2fsprogs/e2fsck.c
trunk/busybox/modutils/insmod.c
trunk/busybox/modutils/modprobe.c
trunk/busybox/networking/traceroute.c
trunk/busybox/shell/hush.c
trunk/busybox/shell/lash.c
Changeset:
Modified: trunk/busybox/e2fsprogs/old_e2fsprogs/e2fsck.c
===================================================================
--- trunk/busybox/e2fsprogs/old_e2fsprogs/e2fsck.c 2007-04-11 17:03:19 UTC (rev 18402)
+++ trunk/busybox/e2fsprogs/old_e2fsprogs/e2fsck.c 2007-04-11 17:04:29 UTC (rev 18403)
@@ -12660,7 +12660,7 @@
cont = ask_yn(_("Do you really want to continue"), -1);
if (!cont) {
printf(_("check aborted.\n"));
- exit (0);
+ exit(0);
}
}
Modified: trunk/busybox/modutils/insmod.c
===================================================================
--- trunk/busybox/modutils/insmod.c 2007-04-11 17:03:19 UTC (rev 18402)
+++ trunk/busybox/modutils/insmod.c 2007-04-11 17:04:29 UTC (rev 18403)
@@ -598,7 +598,7 @@
static unsigned long obj_elf_hash_n(const char *, unsigned long len);
-static struct obj_symbol *obj_find_symbol (struct obj_file *f,
+static struct obj_symbol *obj_find_symbol(struct obj_file *f,
const char *name);
static ElfW(Addr) obj_symbol_final_value(struct obj_file *f,
@@ -610,23 +610,23 @@
unsigned long (*hash)(const char *));
#endif
-static struct obj_section *obj_find_section (struct obj_file *f,
+static struct obj_section *obj_find_section(struct obj_file *f,
const char *name);
-static void obj_insert_section_load_order (struct obj_file *f,
+static void obj_insert_section_load_order(struct obj_file *f,
struct obj_section *sec);
-static struct obj_section *obj_create_alloced_section (struct obj_file *f,
+static struct obj_section *obj_create_alloced_section(struct obj_file *f,
const char *name,
unsigned long align,
unsigned long size);
-static struct obj_section *obj_create_alloced_section_first (struct obj_file *f,
+static struct obj_section *obj_create_alloced_section_first(struct obj_file *f,
const char *name,
unsigned long align,
unsigned long size);
-static void *obj_extend_section (struct obj_section *sec, unsigned long more);
+static void *obj_extend_section(struct obj_section *sec, unsigned long more);
static int obj_string_patch(struct obj_file *f, int secidx, ElfW(Addr) offset,
const char *string);
@@ -638,29 +638,29 @@
static void obj_allocate_commons(struct obj_file *f);
-static unsigned long obj_load_size (struct obj_file *f);
+static unsigned long obj_load_size(struct obj_file *f);
-static int obj_relocate (struct obj_file *f, ElfW(Addr) base);
+static int obj_relocate(struct obj_file *f, ElfW(Addr) base);
static struct obj_file *obj_load(FILE *f, int loadprogbits);
-static int obj_create_image (struct obj_file *f, char *image);
+static int obj_create_image(struct obj_file *f, char *image);
/* Architecture specific manipulation routines. */
-static struct obj_file *arch_new_file (void);
+static struct obj_file *arch_new_file(void);
-static struct obj_section *arch_new_section (void);
+static struct obj_section *arch_new_section(void);
-static struct obj_symbol *arch_new_symbol (void);
+static struct obj_symbol *arch_new_symbol(void);
-static enum obj_reloc arch_apply_relocation (struct obj_file *f,
+static enum obj_reloc arch_apply_relocation(struct obj_file *f,
struct obj_section *targsec,
struct obj_section *symsec,
struct obj_symbol *sym,
ElfW(RelM) *rel, ElfW(Addr) value);
-static void arch_create_got (struct obj_file *f);
+static void arch_create_got(struct obj_file *f);
#if ENABLE_FEATURE_CHECK_TAINTED_MODULE
static int obj_gpl_license(struct obj_file *f, const char **license);
#endif /* FEATURE_CHECK_TAINTED_MODULE */
@@ -2313,13 +2313,13 @@
kernel exports `C names', but module object files
reference `linker names'). */
size_t extra = sizeof SYMBOL_PREFIX;
- size_t name_size = strlen (name) + extra;
+ size_t name_size = strlen(name) + extra;
if (name_size > name_alloced_size) {
name_alloced_size = name_size * 2;
- name_buf = alloca (name_alloced_size);
+ name_buf = alloca(name_alloced_size);
}
- strcpy (name_buf, SYMBOL_PREFIX);
- strcpy (name_buf + extra - 1, name);
+ strcpy(name_buf, SYMBOL_PREFIX);
+ strcpy(name_buf + extra - 1, name);
name = name_buf;
#endif /* SYMBOL_PREFIX */
@@ -2327,8 +2327,8 @@
if (sym && !(ELF_ST_BIND(sym->info) == STB_LOCAL)) {
#ifdef SYMBOL_PREFIX
/* Put NAME_BUF into more permanent storage. */
- name = xmalloc (name_size);
- strcpy (name, name_buf);
+ name = xmalloc(name_size);
+ strcpy(name, name_buf);
#endif
sym = obj_add_symbol(f, name, -1,
ELF_ST_INFO(STB_GLOBAL,
@@ -2351,10 +2351,14 @@
/* Add module symbols first. */
- for (i = 0, m = ext_modules; i < n_ext_modules; ++i, ++m)
+ for (i = 0, m = ext_modules; i < n_ext_modules; ++i, ++m) {
if (m->nsyms
- && add_symbols_from(f, SHN_HIRESERVE + 2 + i, m->syms,
- m->nsyms)) m->used = 1, ++nused;
+ && add_symbols_from(f, SHN_HIRESERVE + 2 + i, m->syms, m->nsyms)
+ ) {
+ m->used = 1;
+ ++nused;
+ }
+ }
n_ext_modules_used = nused;
@@ -2423,9 +2427,9 @@
}
#ifdef SYMBOL_PREFIX
- sym_name = alloca (strlen (key) + sizeof SYMBOL_PREFIX);
- strcpy (sym_name, SYMBOL_PREFIX);
- strcat (sym_name, key);
+ sym_name = alloca(strlen(key) + sizeof SYMBOL_PREFIX);
+ strcpy(sym_name, SYMBOL_PREFIX);
+ strcat(sym_name, key);
#else
sym_name = key;
#endif
@@ -2549,7 +2553,7 @@
obj_string_patch(f, sym->secidx, loc - contents, str);
loc += tgt_sizeof_char_p;
} else {
- /* Array of chars (in fact, matrix !) */
+ /* Array of chars (in fact, matrix!) */
unsigned long charssize; /* size of each member */
/* Get the size of each member */
Modified: trunk/busybox/modutils/modprobe.c
===================================================================
--- trunk/busybox/modutils/modprobe.c 2007-04-11 17:03:19 UTC (rev 18402)
+++ trunk/busybox/modutils/modprobe.c 2007-04-11 17:04:29 UTC (rev 18403)
@@ -677,8 +677,8 @@
char* mod;
char* p;
- pat = xstrdup (pat_src);
- mod = xstrdup (mod_src);
+ pat = xstrdup(pat_src);
+ mod = xstrdup(mod_src);
for (p = pat; (p = strchr(p, '-')); *p++ = '_');
for (p = mod; (p = strchr(p, '-')); *p++ = '_');
Modified: trunk/busybox/networking/traceroute.c
===================================================================
--- trunk/busybox/networking/traceroute.c 2007-04-11 17:03:19 UTC (rev 18402)
+++ trunk/busybox/networking/traceroute.c 2007-04-11 17:04:29 UTC (rev 18403)
@@ -856,7 +856,7 @@
inetname(from);
#if ENABLE_FEATURE_TRACEROUTE_VERBOSE
if (verbose)
- printf(" %d bytes to %s", cc, inet_ntoa (ip->ip_dst));
+ printf(" %d bytes to %s", cc, inet_ntoa(ip->ip_dst));
#endif
}
Modified: trunk/busybox/shell/hush.c
===================================================================
--- trunk/busybox/shell/hush.c 2007-04-11 17:03:19 UTC (rev 18402)
+++ trunk/busybox/shell/hush.c 2007-04-11 17:04:29 UTC (rev 18403)
@@ -489,7 +489,7 @@
{
if (child->argv[1] == NULL)
exit(last_return_code);
- exit (atoi(child->argv[1]));
+ exit(atoi(child->argv[1]));
}
/* built-in 'export VAR=value' handler */
Modified: trunk/busybox/shell/lash.c
===================================================================
--- trunk/busybox/shell/lash.c 2007-04-11 17:03:19 UTC (rev 18402)
+++ trunk/busybox/shell/lash.c 2007-04-11 17:04:29 UTC (rev 18403)
@@ -243,7 +243,7 @@
if (child->argv[1] == NULL)
exit(EXIT_SUCCESS);
- exit (atoi(child->argv[1]));
+ exit(atoi(child->argv[1]));
}
/* built-in 'fg' and 'bg' handler */
More information about the busybox-cvs
mailing list