diff options
Diffstat (limited to 'insmod.c')
-rw-r--r-- | insmod.c | 26 |
1 files changed, 13 insertions, 13 deletions
@@ -78,7 +78,7 @@ | |||
78 | #ifndef MODUTILS_MODULE_H | 78 | #ifndef MODUTILS_MODULE_H |
79 | #define MODUTILS_MODULE_H 1 | 79 | #define MODUTILS_MODULE_H 1 |
80 | 80 | ||
81 | #ident "$Id: insmod.c,v 1.32 2000/12/13 16:41:29 andersen Exp $" | 81 | #ident "$Id: insmod.c,v 1.33 2000/12/18 03:57:16 kraai Exp $" |
82 | 82 | ||
83 | /* This file contains the structures used by the 2.0 and 2.1 kernels. | 83 | /* This file contains the structures used by the 2.0 and 2.1 kernels. |
84 | We do not use the kernel headers directly because we do not wish | 84 | We do not use the kernel headers directly because we do not wish |
@@ -284,7 +284,7 @@ int delete_module(const char *); | |||
284 | #ifndef MODUTILS_OBJ_H | 284 | #ifndef MODUTILS_OBJ_H |
285 | #define MODUTILS_OBJ_H 1 | 285 | #define MODUTILS_OBJ_H 1 |
286 | 286 | ||
287 | #ident "$Id: insmod.c,v 1.32 2000/12/13 16:41:29 andersen Exp $" | 287 | #ident "$Id: insmod.c,v 1.33 2000/12/18 03:57:16 kraai Exp $" |
288 | 288 | ||
289 | /* The relocatable object is manipulated using elfin types. */ | 289 | /* The relocatable object is manipulated using elfin types. */ |
290 | 290 | ||
@@ -1562,7 +1562,7 @@ static int old_get_kernel_symbols(const char *m_name) | |||
1562 | 1562 | ||
1563 | nks = get_kernel_syms(NULL); | 1563 | nks = get_kernel_syms(NULL); |
1564 | if (nks < 0) { | 1564 | if (nks < 0) { |
1565 | error_msg("get_kernel_syms: %s: %s\n", m_name, strerror(errno)); | 1565 | perror_msg("get_kernel_syms: %s", m_name); |
1566 | return 0; | 1566 | return 0; |
1567 | } | 1567 | } |
1568 | 1568 | ||
@@ -1743,7 +1743,7 @@ old_init_module(const char *m_name, struct obj_file *f, | |||
1743 | m_size | (flag_autoclean ? OLD_MOD_AUTOCLEAN | 1743 | m_size | (flag_autoclean ? OLD_MOD_AUTOCLEAN |
1744 | : 0), &routines, symtab); | 1744 | : 0), &routines, symtab); |
1745 | if (ret) | 1745 | if (ret) |
1746 | error_msg("init_module: %s: %s\n", m_name, strerror(errno)); | 1746 | perror_msg("init_module: %s", m_name); |
1747 | 1747 | ||
1748 | free(image); | 1748 | free(image); |
1749 | free(symtab); | 1749 | free(symtab); |
@@ -2055,7 +2055,7 @@ static int new_get_kernel_symbols(void) | |||
2055 | module_names = xrealloc(module_names, bufsize = ret); | 2055 | module_names = xrealloc(module_names, bufsize = ret); |
2056 | goto retry_modules_load; | 2056 | goto retry_modules_load; |
2057 | } | 2057 | } |
2058 | error_msg("QM_MODULES: %s\n", strerror(errno)); | 2058 | perror_msg("QM_MODULES"); |
2059 | return 0; | 2059 | return 0; |
2060 | } | 2060 | } |
2061 | 2061 | ||
@@ -2074,7 +2074,7 @@ static int new_get_kernel_symbols(void) | |||
2074 | /* The module was removed out from underneath us. */ | 2074 | /* The module was removed out from underneath us. */ |
2075 | continue; | 2075 | continue; |
2076 | } | 2076 | } |
2077 | error_msg("query_module: QM_INFO: %s: %s\n", mn, strerror(errno)); | 2077 | perror_msg("query_module: QM_INFO: %s", mn); |
2078 | return 0; | 2078 | return 0; |
2079 | } | 2079 | } |
2080 | 2080 | ||
@@ -2089,7 +2089,7 @@ static int new_get_kernel_symbols(void) | |||
2089 | /* The module was removed out from underneath us. */ | 2089 | /* The module was removed out from underneath us. */ |
2090 | continue; | 2090 | continue; |
2091 | default: | 2091 | default: |
2092 | error_msg("query_module: QM_SYMBOLS: %s: %s\n", mn, strerror(errno)); | 2092 | perror_msg("query_module: QM_SYMBOLS: %s", mn); |
2093 | return 0; | 2093 | return 0; |
2094 | } | 2094 | } |
2095 | } | 2095 | } |
@@ -2114,7 +2114,7 @@ static int new_get_kernel_symbols(void) | |||
2114 | syms = xrealloc(syms, bufsize = ret); | 2114 | syms = xrealloc(syms, bufsize = ret); |
2115 | goto retry_kern_sym_load; | 2115 | goto retry_kern_sym_load; |
2116 | } | 2116 | } |
2117 | error_msg("kernel: QM_SYMBOLS: %s\n", strerror(errno)); | 2117 | perror_msg("kernel: QM_SYMBOLS"); |
2118 | return 0; | 2118 | return 0; |
2119 | } | 2119 | } |
2120 | nksyms = nsyms = ret; | 2120 | nksyms = nsyms = ret; |
@@ -2295,7 +2295,7 @@ new_init_module(const char *m_name, struct obj_file *f, | |||
2295 | 2295 | ||
2296 | ret = new_sys_init_module(m_name, (struct new_module *) image); | 2296 | ret = new_sys_init_module(m_name, (struct new_module *) image); |
2297 | if (ret) | 2297 | if (ret) |
2298 | error_msg("init_module: %s: %s\n", m_name, strerror(errno)); | 2298 | perror_msg("init_module: %s", m_name); |
2299 | 2299 | ||
2300 | free(image); | 2300 | free(image); |
2301 | 2301 | ||
@@ -2680,7 +2680,7 @@ struct obj_file *obj_load(FILE * fp) | |||
2680 | 2680 | ||
2681 | fseek(fp, 0, SEEK_SET); | 2681 | fseek(fp, 0, SEEK_SET); |
2682 | if (fread(&f->header, sizeof(f->header), 1, fp) != 1) { | 2682 | if (fread(&f->header, sizeof(f->header), 1, fp) != 1) { |
2683 | error_msg("error reading ELF header: %s\n", strerror(errno)); | 2683 | perror_msg("error reading ELF header"); |
2684 | return NULL; | 2684 | return NULL; |
2685 | } | 2685 | } |
2686 | 2686 | ||
@@ -2719,7 +2719,7 @@ struct obj_file *obj_load(FILE * fp) | |||
2719 | section_headers = alloca(sizeof(ElfW(Shdr)) * shnum); | 2719 | section_headers = alloca(sizeof(ElfW(Shdr)) * shnum); |
2720 | fseek(fp, f->header.e_shoff, SEEK_SET); | 2720 | fseek(fp, f->header.e_shoff, SEEK_SET); |
2721 | if (fread(section_headers, sizeof(ElfW(Shdr)), shnum, fp) != shnum) { | 2721 | if (fread(section_headers, sizeof(ElfW(Shdr)), shnum, fp) != shnum) { |
2722 | error_msg("error reading ELF section headers: %s\n", strerror(errno)); | 2722 | perror_msg("error reading ELF section headers"); |
2723 | return NULL; | 2723 | return NULL; |
2724 | } | 2724 | } |
2725 | 2725 | ||
@@ -2749,7 +2749,7 @@ struct obj_file *obj_load(FILE * fp) | |||
2749 | sec->contents = xmalloc(sec->header.sh_size); | 2749 | sec->contents = xmalloc(sec->header.sh_size); |
2750 | fseek(fp, sec->header.sh_offset, SEEK_SET); | 2750 | fseek(fp, sec->header.sh_offset, SEEK_SET); |
2751 | if (fread(sec->contents, sec->header.sh_size, 1, fp) != 1) { | 2751 | if (fread(sec->contents, sec->header.sh_size, 1, fp) != 1) { |
2752 | error_msg("error reading ELF section data: %s\n", strerror(errno)); | 2752 | perror_msg("error reading ELF section data"); |
2753 | return NULL; | 2753 | return NULL; |
2754 | } | 2754 | } |
2755 | } else { | 2755 | } else { |
@@ -3075,7 +3075,7 @@ extern int insmod_main( int argc, char **argv) | |||
3075 | m_size); | 3075 | m_size); |
3076 | goto out; | 3076 | goto out; |
3077 | default: | 3077 | default: |
3078 | error_msg("create_module: %s: %s\n", m_name, strerror(errno)); | 3078 | perror_msg("create_module: %s", m_name); |
3079 | goto out; | 3079 | goto out; |
3080 | } | 3080 | } |
3081 | 3081 | ||