diff options
author | Matt Kraai <kraai@debian.org> | 2000-10-23 18:03:46 +0000 |
---|---|---|
committer | Matt Kraai <kraai@debian.org> | 2000-10-23 18:03:46 +0000 |
commit | 207061ac0d400f663dc411c132d7fc07dca7d496 (patch) | |
tree | 4d50f76923e65e6247dc399f20b37c5c1bc79487 /modutils | |
parent | 2be4797a06849cf5c9c4f97e1489d70b7fc8be36 (diff) | |
download | busybox-w32-207061ac0d400f663dc411c132d7fc07dca7d496.tar.gz busybox-w32-207061ac0d400f663dc411c132d7fc07dca7d496.tar.bz2 busybox-w32-207061ac0d400f663dc411c132d7fc07dca7d496.zip |
Fix error messages.
Diffstat (limited to 'modutils')
-rw-r--r-- | modutils/insmod.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/modutils/insmod.c b/modutils/insmod.c index 2b7ae961a..4f96c950e 100644 --- a/modutils/insmod.c +++ b/modutils/insmod.c | |||
@@ -77,7 +77,7 @@ | |||
77 | #ifndef MODUTILS_MODULE_H | 77 | #ifndef MODUTILS_MODULE_H |
78 | #define MODUTILS_MODULE_H 1 | 78 | #define MODUTILS_MODULE_H 1 |
79 | 79 | ||
80 | #ident "$Id: insmod.c,v 1.27 2000/10/23 17:55:27 kraai Exp $" | 80 | #ident "$Id: insmod.c,v 1.28 2000/10/23 18:03:46 kraai Exp $" |
81 | 81 | ||
82 | /* This file contains the structures used by the 2.0 and 2.1 kernels. | 82 | /* This file contains the structures used by the 2.0 and 2.1 kernels. |
83 | We do not use the kernel headers directly because we do not wish | 83 | We do not use the kernel headers directly because we do not wish |
@@ -283,7 +283,7 @@ int delete_module(const char *); | |||
283 | #ifndef MODUTILS_OBJ_H | 283 | #ifndef MODUTILS_OBJ_H |
284 | #define MODUTILS_OBJ_H 1 | 284 | #define MODUTILS_OBJ_H 1 |
285 | 285 | ||
286 | #ident "$Id: insmod.c,v 1.27 2000/10/23 17:55:27 kraai Exp $" | 286 | #ident "$Id: insmod.c,v 1.28 2000/10/23 18:03:46 kraai Exp $" |
287 | 287 | ||
288 | /* The relocatable object is manipulated using elfin types. */ | 288 | /* The relocatable object is manipulated using elfin types. */ |
289 | 289 | ||
@@ -1456,7 +1456,7 @@ static int old_get_kernel_symbols(const char *m_name) | |||
1456 | 1456 | ||
1457 | nks = get_kernel_syms(NULL); | 1457 | nks = get_kernel_syms(NULL); |
1458 | if (nks < 0) { | 1458 | if (nks < 0) { |
1459 | errorMsg("get_kernel_syms: %s: %s", m_name, strerror(errno)); | 1459 | errorMsg("get_kernel_syms: %s: %s\n", m_name, strerror(errno)); |
1460 | return 0; | 1460 | return 0; |
1461 | } | 1461 | } |
1462 | 1462 | ||
@@ -1637,7 +1637,7 @@ old_init_module(const char *m_name, struct obj_file *f, | |||
1637 | m_size | (flag_autoclean ? OLD_MOD_AUTOCLEAN | 1637 | m_size | (flag_autoclean ? OLD_MOD_AUTOCLEAN |
1638 | : 0), &routines, symtab); | 1638 | : 0), &routines, symtab); |
1639 | if (ret) | 1639 | if (ret) |
1640 | errorMsg("init_module: %s: %s", m_name, strerror(errno)); | 1640 | errorMsg("init_module: %s: %s\n", m_name, strerror(errno)); |
1641 | 1641 | ||
1642 | free(image); | 1642 | free(image); |
1643 | free(symtab); | 1643 | free(symtab); |
@@ -1949,7 +1949,7 @@ static int new_get_kernel_symbols(void) | |||
1949 | module_names = xrealloc(module_names, bufsize = ret); | 1949 | module_names = xrealloc(module_names, bufsize = ret); |
1950 | goto retry_modules_load; | 1950 | goto retry_modules_load; |
1951 | } | 1951 | } |
1952 | errorMsg("QM_MODULES: %s", strerror(errno)); | 1952 | errorMsg("QM_MODULES: %s\n", strerror(errno)); |
1953 | return 0; | 1953 | return 0; |
1954 | } | 1954 | } |
1955 | 1955 | ||
@@ -1968,7 +1968,7 @@ static int new_get_kernel_symbols(void) | |||
1968 | /* The module was removed out from underneath us. */ | 1968 | /* The module was removed out from underneath us. */ |
1969 | continue; | 1969 | continue; |
1970 | } | 1970 | } |
1971 | errorMsg("query_module: QM_INFO: %s: %s", mn, strerror(errno)); | 1971 | errorMsg("query_module: QM_INFO: %s: %s\n", mn, strerror(errno)); |
1972 | return 0; | 1972 | return 0; |
1973 | } | 1973 | } |
1974 | 1974 | ||
@@ -1983,7 +1983,7 @@ static int new_get_kernel_symbols(void) | |||
1983 | /* The module was removed out from underneath us. */ | 1983 | /* The module was removed out from underneath us. */ |
1984 | continue; | 1984 | continue; |
1985 | default: | 1985 | default: |
1986 | errorMsg("query_module: QM_SYMBOLS: %s: %s", mn, strerror(errno)); | 1986 | errorMsg("query_module: QM_SYMBOLS: %s: %s\n", mn, strerror(errno)); |
1987 | return 0; | 1987 | return 0; |
1988 | } | 1988 | } |
1989 | } | 1989 | } |
@@ -2008,7 +2008,7 @@ static int new_get_kernel_symbols(void) | |||
2008 | syms = xrealloc(syms, bufsize = ret); | 2008 | syms = xrealloc(syms, bufsize = ret); |
2009 | goto retry_kern_sym_load; | 2009 | goto retry_kern_sym_load; |
2010 | } | 2010 | } |
2011 | errorMsg("kernel: QM_SYMBOLS: %s", strerror(errno)); | 2011 | errorMsg("kernel: QM_SYMBOLS: %s\n", strerror(errno)); |
2012 | return 0; | 2012 | return 0; |
2013 | } | 2013 | } |
2014 | nksyms = nsyms = ret; | 2014 | nksyms = nsyms = ret; |
@@ -2189,7 +2189,7 @@ new_init_module(const char *m_name, struct obj_file *f, | |||
2189 | 2189 | ||
2190 | ret = new_sys_init_module(m_name, (struct new_module *) image); | 2190 | ret = new_sys_init_module(m_name, (struct new_module *) image); |
2191 | if (ret) | 2191 | if (ret) |
2192 | errorMsg("init_module: %s: %s", m_name, strerror(errno)); | 2192 | errorMsg("init_module: %s: %s\n", m_name, strerror(errno)); |
2193 | 2193 | ||
2194 | free(image); | 2194 | free(image); |
2195 | 2195 | ||
@@ -2569,7 +2569,7 @@ struct obj_file *obj_load(FILE * fp) | |||
2569 | 2569 | ||
2570 | fseek(fp, 0, SEEK_SET); | 2570 | fseek(fp, 0, SEEK_SET); |
2571 | if (fread(&f->header, sizeof(f->header), 1, fp) != 1) { | 2571 | if (fread(&f->header, sizeof(f->header), 1, fp) != 1) { |
2572 | errorMsg("error reading ELF header: %s", strerror(errno)); | 2572 | errorMsg("error reading ELF header: %s\n", strerror(errno)); |
2573 | return NULL; | 2573 | return NULL; |
2574 | } | 2574 | } |
2575 | 2575 | ||
@@ -2608,7 +2608,7 @@ struct obj_file *obj_load(FILE * fp) | |||
2608 | section_headers = alloca(sizeof(ElfW(Shdr)) * shnum); | 2608 | section_headers = alloca(sizeof(ElfW(Shdr)) * shnum); |
2609 | fseek(fp, f->header.e_shoff, SEEK_SET); | 2609 | fseek(fp, f->header.e_shoff, SEEK_SET); |
2610 | if (fread(section_headers, sizeof(ElfW(Shdr)), shnum, fp) != shnum) { | 2610 | if (fread(section_headers, sizeof(ElfW(Shdr)), shnum, fp) != shnum) { |
2611 | errorMsg("error reading ELF section headers: %s", strerror(errno)); | 2611 | errorMsg("error reading ELF section headers: %s\n", strerror(errno)); |
2612 | return NULL; | 2612 | return NULL; |
2613 | } | 2613 | } |
2614 | 2614 | ||
@@ -2638,7 +2638,7 @@ struct obj_file *obj_load(FILE * fp) | |||
2638 | sec->contents = xmalloc(sec->header.sh_size); | 2638 | sec->contents = xmalloc(sec->header.sh_size); |
2639 | fseek(fp, sec->header.sh_offset, SEEK_SET); | 2639 | fseek(fp, sec->header.sh_offset, SEEK_SET); |
2640 | if (fread(sec->contents, sec->header.sh_size, 1, fp) != 1) { | 2640 | if (fread(sec->contents, sec->header.sh_size, 1, fp) != 1) { |
2641 | errorMsg("error reading ELF section data: %s", strerror(errno)); | 2641 | errorMsg("error reading ELF section data: %s\n", strerror(errno)); |
2642 | return NULL; | 2642 | return NULL; |
2643 | } | 2643 | } |
2644 | } else { | 2644 | } else { |