re-indent
This commit is contained in:
parent
d242e49c89
commit
3b1a74467a
@ -282,7 +282,7 @@ extern int insmod_ng_main( int argc, char **argv);
|
|||||||
#ifndef MODUTILS_MODULE_H
|
#ifndef MODUTILS_MODULE_H
|
||||||
static const int MODUTILS_MODULE_H = 1;
|
static const int MODUTILS_MODULE_H = 1;
|
||||||
|
|
||||||
#ident "$Id: insmod.c,v 1.108 2003/12/19 21:04:19 andersen Exp $"
|
#ident "$Id: insmod.c,v 1.109 2003/12/24 20:30:45 andersen Exp $"
|
||||||
|
|
||||||
/* This file contains the structures used by the 2.0 and 2.1 kernels.
|
/* This file contains the structures used by the 2.0 and 2.1 kernels.
|
||||||
We do not use the kernel headers directly because we do not wish
|
We do not use the kernel headers directly because we do not wish
|
||||||
@ -503,7 +503,7 @@ int delete_module(const char *);
|
|||||||
#ifndef MODUTILS_OBJ_H
|
#ifndef MODUTILS_OBJ_H
|
||||||
static const int MODUTILS_OBJ_H = 1;
|
static const int MODUTILS_OBJ_H = 1;
|
||||||
|
|
||||||
#ident "$Id: insmod.c,v 1.108 2003/12/19 21:04:19 andersen Exp $"
|
#ident "$Id: insmod.c,v 1.109 2003/12/24 20:30:45 andersen Exp $"
|
||||||
|
|
||||||
/* The relocatable object is manipulated using elfin types. */
|
/* The relocatable object is manipulated using elfin types. */
|
||||||
|
|
||||||
@ -1323,7 +1323,7 @@ arch_apply_relocation(struct obj_file *f,
|
|||||||
|
|
||||||
#if defined(CONFIG_USE_PLT_ENTRIES)
|
#if defined(CONFIG_USE_PLT_ENTRIES)
|
||||||
|
|
||||||
bb_use_plt:
|
bb_use_plt:
|
||||||
|
|
||||||
/* find the plt entry and initialize it if necessary */
|
/* find the plt entry and initialize it if necessary */
|
||||||
assert(isym != NULL);
|
assert(isym != NULL);
|
||||||
@ -1403,7 +1403,7 @@ arch_apply_relocation(struct obj_file *f,
|
|||||||
#endif /* CONFIG_USE_PLT_ENTRIES */
|
#endif /* CONFIG_USE_PLT_ENTRIES */
|
||||||
|
|
||||||
#if defined(CONFIG_USE_GOT_ENTRIES)
|
#if defined(CONFIG_USE_GOT_ENTRIES)
|
||||||
bb_use_got:
|
bb_use_got:
|
||||||
|
|
||||||
assert(isym != NULL);
|
assert(isym != NULL);
|
||||||
/* needs an entry in the .got: set it, once */
|
/* needs an entry in the .got: set it, once */
|
||||||
@ -1814,7 +1814,7 @@ obj_add_symbol(struct obj_file *f, const char *name,
|
|||||||
f->local_symtab[symidx] = sym;
|
f->local_symtab[symidx] = sym;
|
||||||
}
|
}
|
||||||
|
|
||||||
found:
|
found:
|
||||||
sym->name = name;
|
sym->name = name;
|
||||||
sym->value = value;
|
sym->value = value;
|
||||||
sym->size = size;
|
sym->size = size;
|
||||||
@ -2659,7 +2659,7 @@ new_process_module_arguments(struct obj_file *f, int argc, char **argv)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
retry_end_of_value:
|
retry_end_of_value:
|
||||||
switch (*q) {
|
switch (*q) {
|
||||||
case '\0':
|
case '\0':
|
||||||
goto end_of_arg;
|
goto end_of_arg;
|
||||||
@ -2685,7 +2685,7 @@ new_process_module_arguments(struct obj_file *f, int argc, char **argv)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
end_of_arg:
|
end_of_arg:
|
||||||
if (n < min) {
|
if (n < min) {
|
||||||
bb_error_msg("too few values for %s (min %d)", key, min);
|
bb_error_msg("too few values for %s (min %d)", key, min);
|
||||||
return 0;
|
return 0;
|
||||||
@ -2750,7 +2750,7 @@ static int new_get_kernel_symbols(void)
|
|||||||
/* Collect the loaded modules. */
|
/* Collect the loaded modules. */
|
||||||
|
|
||||||
module_names = xmalloc(bufsize = 256);
|
module_names = xmalloc(bufsize = 256);
|
||||||
retry_modules_load:
|
retry_modules_load:
|
||||||
if (query_module(NULL, QM_MODULES, module_names, bufsize, &ret)) {
|
if (query_module(NULL, QM_MODULES, module_names, bufsize, &ret)) {
|
||||||
if (errno == ENOSPC && bufsize < ret) {
|
if (errno == ENOSPC && bufsize < ret) {
|
||||||
module_names = xrealloc(module_names, bufsize = ret);
|
module_names = xrealloc(module_names, bufsize = ret);
|
||||||
@ -2781,7 +2781,7 @@ static int new_get_kernel_symbols(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
syms = xmalloc(bufsize = 1024);
|
syms = xmalloc(bufsize = 1024);
|
||||||
retry_mod_sym_load:
|
retry_mod_sym_load:
|
||||||
if (query_module(mn, QM_SYMBOLS, syms, bufsize, &ret)) {
|
if (query_module(mn, QM_SYMBOLS, syms, bufsize, &ret)) {
|
||||||
switch (errno) {
|
switch (errno) {
|
||||||
case ENOSPC:
|
case ENOSPC:
|
||||||
@ -2811,7 +2811,7 @@ static int new_get_kernel_symbols(void)
|
|||||||
/* Collect the kernel's symbols. */
|
/* Collect the kernel's symbols. */
|
||||||
|
|
||||||
syms = xmalloc(bufsize = 16 * 1024);
|
syms = xmalloc(bufsize = 16 * 1024);
|
||||||
retry_kern_sym_load:
|
retry_kern_sym_load:
|
||||||
if (query_module(NULL, QM_SYMBOLS, syms, bufsize, &ret)) {
|
if (query_module(NULL, QM_SYMBOLS, syms, bufsize, &ret)) {
|
||||||
if (errno == ENOSPC && bufsize < ret) {
|
if (errno == ENOSPC && bufsize < ret) {
|
||||||
syms = xrealloc(syms, bufsize = ret);
|
syms = xrealloc(syms, bufsize = ret);
|
||||||
@ -3349,7 +3349,7 @@ static int obj_relocate(struct obj_file *f, ElfW(Addr) base)
|
|||||||
goto bad_reloc;
|
goto bad_reloc;
|
||||||
case obj_reloc_unhandled:
|
case obj_reloc_unhandled:
|
||||||
errmsg = "Unhandled relocation";
|
errmsg = "Unhandled relocation";
|
||||||
bad_reloc:
|
bad_reloc:
|
||||||
if (extsym) {
|
if (extsym) {
|
||||||
bb_error_msg("%s of type %ld for %s", errmsg,
|
bb_error_msg("%s of type %ld for %s", errmsg,
|
||||||
(long) ELFW(R_TYPE) (rel->r_info),
|
(long) ELFW(R_TYPE) (rel->r_info),
|
||||||
@ -4055,10 +4055,11 @@ extern int insmod_main( int argc, char **argv)
|
|||||||
|
|
||||||
/* Parse any options */
|
/* Parse any options */
|
||||||
#ifdef CONFIG_FEATURE_INSMOD_LOAD_MAP
|
#ifdef CONFIG_FEATURE_INSMOD_LOAD_MAP
|
||||||
while ((opt = getopt(argc, argv, "fkqsvxmLo:")) > 0) {
|
while ((opt = getopt(argc, argv, "fkqsvxmLo:")) > 0)
|
||||||
#else
|
#else
|
||||||
while ((opt = getopt(argc, argv, "fkqsvxLo:")) > 0) {
|
while ((opt = getopt(argc, argv, "fkqsvxLo:")) > 0)
|
||||||
#endif
|
#endif
|
||||||
|
{
|
||||||
switch (opt) {
|
switch (opt) {
|
||||||
case 'f': /* force loading */
|
case 'f': /* force loading */
|
||||||
flag_force_load = 1;
|
flag_force_load = 1;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user