Commit 381259ef authored by Paul Eggert's avatar Paul Eggert

Change unexec implementations to match prototype.

parent a3a6c54e
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
* emacs.c [!defined CANNOT_DUMP]: Include unexec.h. * emacs.c [!defined CANNOT_DUMP]: Include unexec.h.
* unexaix.c, unexcoff.c, unexcw.c, unexelf.c, unexhp9k800.c: * unexaix.c, unexcoff.c, unexcw.c, unexelf.c, unexhp9k800.c:
* unexmacosx.c, unexsol.c, unexw32.c: Include unexec.h. * unexmacosx.c, unexsol.c, unexw32.c: Include unexec.h.
Change as necessary to match prototype in unexec.h.
* syntax.c (Fforward_comment, scan_lists): Rename locals to avoid * syntax.c (Fforward_comment, scan_lists): Rename locals to avoid
shadowing. shadowing.
...@@ -121,7 +121,8 @@ static void write_segment (int, char *, char *); ...@@ -121,7 +121,8 @@ static void write_segment (int, char *, char *);
* *
* driving logic. * driving logic.
*/ */
int unexec (const char *new_name, const char *a_name) void
unexec (const char *new_name, const char *a_name)
{ {
int new = -1, a_out = -1; int new = -1, a_out = -1;
...@@ -141,14 +142,12 @@ int unexec (const char *new_name, const char *a_name) ...@@ -141,14 +142,12 @@ int unexec (const char *new_name, const char *a_name)
|| unrelocate_symbols (new, a_out, a_name, new_name) < 0) || unrelocate_symbols (new, a_out, a_name, new_name) < 0)
{ {
close (new); close (new);
return -1;
} }
close (new); close (new);
if (a_out >= 0) if (a_out >= 0)
close (a_out); close (a_out);
mark_x (new_name); mark_x (new_name);
return 0;
} }
/* **************************************************************** /* ****************************************************************
...@@ -639,4 +638,3 @@ start_of_text (void) ...@@ -639,4 +638,3 @@ start_of_text (void)
{ {
return ((char *) 0x10000000); return ((char *) 0x10000000);
} }
...@@ -524,7 +524,7 @@ adjust_lnnoptrs (int writedesc, int readdesc, const char *new_name) ...@@ -524,7 +524,7 @@ adjust_lnnoptrs (int writedesc, int readdesc, const char *new_name)
* *
* driving logic. * driving logic.
*/ */
int void
unexec (const char *new_name, const char *a_name) unexec (const char *new_name, const char *a_name)
{ {
int new = -1, a_out = -1; int new = -1, a_out = -1;
...@@ -545,15 +545,12 @@ unexec (const char *new_name, const char *a_name) ...@@ -545,15 +545,12 @@ unexec (const char *new_name, const char *a_name)
) )
{ {
close (new); close (new);
return -1;
} }
close (new); close (new);
if (a_out >= 0) if (a_out >= 0)
close (a_out); close (a_out);
mark_x (new_name); mark_x (new_name);
return 0;
} }
#endif /* not CANNOT_DUMP */ #endif /* not CANNOT_DUMP */
...@@ -249,7 +249,7 @@ add_exe_suffix_if_necessary (const char *name, char *modified) ...@@ -249,7 +249,7 @@ add_exe_suffix_if_necessary (const char *name, char *modified)
return (modified); return (modified);
} }
int void
unexec (const char *outfile, const char *infile) unexec (const char *outfile, const char *infile)
{ {
char infile_buffer[FILENAME_MAX]; char infile_buffer[FILENAME_MAX];
...@@ -263,7 +263,6 @@ unexec (const char *outfile, const char *infile) ...@@ -263,7 +263,6 @@ unexec (const char *outfile, const char *infile)
{ {
/* can only dump once */ /* can only dump once */
printf ("You can only dump Emacs once on this platform.\n"); printf ("You can only dump Emacs once on this platform.\n");
return (1);
} }
report_sheap_usage (1); report_sheap_usage (1);
...@@ -298,6 +297,4 @@ unexec (const char *outfile, const char *infile) ...@@ -298,6 +297,4 @@ unexec (const char *outfile, const char *infile)
ret = close (fd_out); ret = close (fd_out);
assert (ret == 0); assert (ret == 0);
return (0);
} }
...@@ -76,7 +76,7 @@ run_time_remap (ignored) ...@@ -76,7 +76,7 @@ run_time_remap (ignored)
/* Create a new a.out file, same as old but with current data space */ /* Create a new a.out file, same as old but with current data space */
int void
unexec (const char *new_name, /* name of the new a.out file to be created */ unexec (const char *new_name, /* name of the new a.out file to be created */
const char *old_name) /* name of the old a.out file */ const char *old_name) /* name of the old a.out file */
{ {
...@@ -133,7 +133,6 @@ unexec (const char *new_name, /* name of the new a.out file to be created * ...@@ -133,7 +133,6 @@ unexec (const char *new_name, /* name of the new a.out file to be created *
/* Close the binary file */ /* Close the binary file */
close (old); close (old);
close (new); close (new);
return 0;
} }
/* Save current data space in the file, update header. */ /* Save current data space in the file, update header. */
......
...@@ -1227,7 +1227,7 @@ dump_it (void) ...@@ -1227,7 +1227,7 @@ dump_it (void)
from it. The file names of the output and input files are outfile from it. The file names of the output and input files are outfile
and infile, respectively. The three other parameters are and infile, respectively. The three other parameters are
ignored. */ ignored. */
int void
unexec (const char *outfile, const char *infile) unexec (const char *outfile, const char *infile)
{ {
if (in_dumped_exec) if (in_dumped_exec)
...@@ -1258,7 +1258,6 @@ unexec (const char *outfile, const char *infile) ...@@ -1258,7 +1258,6 @@ unexec (const char *outfile, const char *infile)
dump_it (); dump_it ();
close (outfd); close (outfd);
return 0;
} }
...@@ -1383,4 +1382,3 @@ unexec_free (void *ptr) ...@@ -1383,4 +1382,3 @@ unexec_free (void *ptr)
else else
malloc_zone_free (emacs_zone, (unexec_malloc_header_t *) ptr - 1); malloc_zone_free (emacs_zone, (unexec_malloc_header_t *) ptr - 1);
} }
...@@ -11,14 +11,14 @@ ...@@ -11,14 +11,14 @@
#include "charset.h" #include "charset.h"
#include "coding.h" #include "coding.h"
int void
unexec (const char *new_name, const char *old_name) unexec (const char *new_name, const char *old_name)
{ {
Lisp_Object data; Lisp_Object data;
Lisp_Object errstring; Lisp_Object errstring;
if (! dldump (0, new_name, RTLD_MEMORY)) if (! dldump (0, new_name, RTLD_MEMORY))
return 0; return;
data = Fcons (build_string (new_name), Qnil); data = Fcons (build_string (new_name), Qnil);
synchronize_system_messages_locale (); synchronize_system_messages_locale ();
...@@ -28,4 +28,3 @@ unexec (const char *new_name, const char *old_name) ...@@ -28,4 +28,3 @@ unexec (const char *new_name, const char *old_name)
xsignal (Qfile_error, xsignal (Qfile_error,
Fcons (build_string ("Cannot unexec"), Fcons (errstring, data))); Fcons (build_string ("Cannot unexec"), Fcons (errstring, data)));
} }
...@@ -724,7 +724,7 @@ copy_executable_and_dump_data (file_data *p_infile, ...@@ -724,7 +724,7 @@ copy_executable_and_dump_data (file_data *p_infile,
/* Dump out .data and .bss sections into a new executable. */ /* Dump out .data and .bss sections into a new executable. */
int void
unexec (const char *new_name, const char *old_name) unexec (const char *new_name, const char *old_name)
{ {
file_data in_file, out_file; file_data in_file, out_file;
...@@ -820,9 +820,6 @@ unexec (const char *new_name, const char *old_name) ...@@ -820,9 +820,6 @@ unexec (const char *new_name, const char *old_name)
close_file_data (&in_file); close_file_data (&in_file);
close_file_data (&out_file); close_file_data (&out_file);
return 0;
} }
/* eof */ /* eof */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment