diff options
author | Juanma Barranquero <lekktu@gmail.com> | 2010-09-28 02:55:08 +0200 |
---|---|---|
committer | Juanma Barranquero <lekktu@gmail.com> | 2010-09-28 02:55:08 +0200 |
commit | 0597ab06f6681758096685a0cd3ed3f24ab6e971 (patch) | |
tree | 462befdef914fd872fd42949d804a9b0b90cfbef /nt/preprep.c | |
parent | 95b6d681b1121e1be8955aa3f79dd39098edf4cf (diff) | |
download | emacs-0597ab06f6681758096685a0cd3ed3f24ab6e971.tar.gz |
nt/*.c: Use const char*; remove unused code.
* addpm.c (entry, add_registry, main):
* addsection.c (file_data, open_input_file, open_output_file)
(find_section, PTR_TO_OFFSET, copy_executable_and_add_section)
(COPY_CHUNK):
* cmdproxy.c (vfprintf, fprintf, printf, fail, warn, skip_space)
(skip_nonspace, get_next_token, search_dir, make_absolute)
(spawn, main):
* preprep.c (file_data, open_input_file, open_output_file)
(open_inout_file, find_section, PTR_TO_OFFSET, COPY_CHUNK, main):
Use const char*.
* cmdproxy.c (stdin): Don't define, not used.
(main): Don't assign remlen after last use.
Diffstat (limited to 'nt/preprep.c')
-rw-r--r-- | nt/preprep.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/nt/preprep.c b/nt/preprep.c index dbcc8a85682..220b0e40ce6 100644 --- a/nt/preprep.c +++ b/nt/preprep.c @@ -1,4 +1,4 @@ -/* Pro-process emacs.exe for profiling by MSVC. +/* Pre-process emacs.exe for profiling by MSVC. Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. @@ -37,9 +37,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. PIMAGE_NT_HEADERS (__stdcall * pfnCheckSumMappedFile) (LPVOID BaseAddress, - DWORD FileLength, - LPDWORD HeaderSum, - LPDWORD CheckSum); + DWORD FileLength, + LPDWORD HeaderSum, + LPDWORD CheckSum); #undef min #undef max @@ -50,15 +50,15 @@ PIMAGE_NT_HEADERS /* File handling. */ typedef struct file_data { - char *name; - unsigned long size; - HANDLE file; - HANDLE file_mapping; - unsigned char *file_base; + const char *name; + unsigned long size; + HANDLE file; + HANDLE file_mapping; + unsigned char *file_base; } file_data; int -open_input_file (file_data *p_file, char *filename) +open_input_file (file_data *p_file, const char *filename) { HANDLE file; HANDLE file_mapping; @@ -90,7 +90,7 @@ open_input_file (file_data *p_file, char *filename) } int -open_output_file (file_data *p_file, char *filename, unsigned long size) +open_output_file (file_data *p_file, const char *filename, unsigned long size) { HANDLE file; HANDLE file_mapping; @@ -120,7 +120,7 @@ open_output_file (file_data *p_file, char *filename, unsigned long size) } int -open_inout_file (file_data *p_file, char *filename) +open_inout_file (file_data *p_file, const char *filename) { HANDLE file; HANDLE file_mapping; @@ -178,7 +178,7 @@ get_unrounded_section_size (PIMAGE_SECTION_HEADER p_section) /* Return pointer to section header for named section. */ IMAGE_SECTION_HEADER * -find_section (char * name, IMAGE_NT_HEADERS * nt_header) +find_section (const char *name, IMAGE_NT_HEADERS *nt_header) { PIMAGE_SECTION_HEADER section; int i; @@ -295,7 +295,7 @@ relocate_offset (DWORD offset, #define PTR_TO_RVA(ptr) ((DWORD)(ptr) - (DWORD) GetModuleHandle (NULL)) #define PTR_TO_OFFSET(ptr, pfile_data) \ - ((unsigned char *)(ptr) - (pfile_data)->file_base) + ((unsigned const char *)(ptr) - (pfile_data)->file_base) #define OFFSET_TO_PTR(offset, pfile_data) \ ((pfile_data)->file_base + (DWORD)(offset)) @@ -361,7 +361,7 @@ copy_executable_and_move_sections (file_data *p_infile, #define COPY_CHUNK(message, src, size) \ do { \ - unsigned char *s = (void *)(src); \ + unsigned const char *s = (void *)(src); \ unsigned long count = (size); \ printf ("%s\n", (message)); \ printf ("\t0x%08x Offset in input file.\n", s - p_infile->file_base); \ @@ -766,7 +766,7 @@ main (int argc, char **argv) PIMAGE_NT_HEADERS nt_header; file_data in_file, out_file; char out_filename[MAX_PATH], in_filename[MAX_PATH]; - char *ptr; + const char *ptr; strcpy (in_filename, argv[1]); strcpy (out_filename, argv[2]); |