[Emacs-diffs] /srv/bzr/emacs/trunk r103680: Change unexec implementations to match prototype.

[Paul Eggert]

------------------------------------------------------------
revno: 103680
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Thu 2011-03-17 11:41:30 -0700
message:
  Change unexec implementations to match prototype.
modified:
  src/ChangeLog
  src/unexaix.c
  src/unexcoff.c
  src/unexcw.c
  src/unexhp9k800.c
  src/unexmacosx.c
  src/unexsol.c
  src/unexw32.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-03-17 16:51:42 +0000
+++ b/src/ChangeLog     2011-03-17 18:41:30 +0000
@@ -36,6 +36,7 @@
        * emacs.c [!defined CANNOT_DUMP]: Include unexec.h.
        * unexaix.c, unexcoff.c, unexcw.c, unexelf.c, unexhp9k800.c:
        * 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
        shadowing.

=== modified file 'src/unexaix.c'
--- a/src/unexaix.c     2011-03-16 23:59:54 +0000
+++ b/src/unexaix.c     2011-03-17 18:41:30 +0000
@@ -121,7 +121,8 @@
  *
  * 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;
 
@@ -141,14 +142,12 @@
       || unrelocate_symbols (new, a_out, a_name, new_name) < 0)
     {
       close (new);
-      return -1;
     }
 
   close (new);
   if (a_out >= 0)
     close (a_out);
   mark_x (new_name);
-  return 0;
 }
 
 /* ****************************************************************
@@ -639,4 +638,3 @@
 {
   return ((char *) 0x10000000);
 }
-

=== modified file 'src/unexcoff.c'
--- a/src/unexcoff.c    2011-03-16 23:59:54 +0000
+++ b/src/unexcoff.c    2011-03-17 18:41:30 +0000
@@ -524,7 +524,7 @@
  *
  * driving logic.
  */
-int
+void
 unexec (const char *new_name, const char *a_name)
 {
   int new = -1, a_out = -1;
@@ -545,15 +545,12 @@
       )
     {
       close (new);
-      return -1;
     }
 
   close (new);
   if (a_out >= 0)
     close (a_out);
   mark_x (new_name);
-  return 0;
 }
 
 #endif /* not CANNOT_DUMP */
-

=== modified file 'src/unexcw.c'
--- a/src/unexcw.c      2011-03-16 23:59:54 +0000
+++ b/src/unexcw.c      2011-03-17 18:41:30 +0000
@@ -249,7 +249,7 @@
   return (modified);
 }
 
-int
+void
 unexec (const char *outfile, const char *infile)
 {
   char infile_buffer[FILENAME_MAX];
@@ -263,7 +263,6 @@
     {
       /* can only dump once */
       printf ("You can only dump Emacs once on this platform.\n");
-      return (1);
     }
 
   report_sheap_usage (1);
@@ -298,6 +297,4 @@
 
   ret = close (fd_out);
   assert (ret == 0);
-
-  return (0);
 }

=== modified file 'src/unexhp9k800.c'
--- a/src/unexhp9k800.c 2011-03-16 23:59:54 +0000
+++ b/src/unexhp9k800.c 2011-03-17 18:41:30 +0000
@@ -76,7 +76,7 @@
 
 
 /* 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 
*/
        const char *old_name)       /* name of the old a.out file */
 {
@@ -133,7 +133,6 @@
   /* Close the binary file */
   close (old);
   close (new);
-  return 0;
 }
 
 /* Save current data space in the file, update header.  */

=== modified file 'src/unexmacosx.c'
--- a/src/unexmacosx.c  2011-03-16 23:59:54 +0000
+++ b/src/unexmacosx.c  2011-03-17 18:41:30 +0000
@@ -1227,7 +1227,7 @@
    from it.  The file names of the output and input files are outfile
    and infile, respectively.  The three other parameters are
    ignored.  */
-int
+void
 unexec (const char *outfile, const char *infile)
 {
   if (in_dumped_exec)
@@ -1258,7 +1258,6 @@
   dump_it ();
 
   close (outfd);
-  return 0;
 }
 
 
@@ -1383,4 +1382,3 @@
   else
     malloc_zone_free (emacs_zone, (unexec_malloc_header_t *) ptr - 1);
 }
-

=== modified file 'src/unexsol.c'
--- a/src/unexsol.c     2011-03-16 23:59:54 +0000
+++ b/src/unexsol.c     2011-03-17 18:41:30 +0000
@@ -11,14 +11,14 @@
 #include "charset.h"
 #include "coding.h"
 
-int
+void
 unexec (const char *new_name, const char *old_name)
 {
   Lisp_Object data;
   Lisp_Object errstring;
 
   if (! dldump (0, new_name, RTLD_MEMORY))
-    return 0;
+    return;
 
   data = Fcons (build_string (new_name), Qnil);
   synchronize_system_messages_locale ();
@@ -28,4 +28,3 @@
   xsignal (Qfile_error,
           Fcons (build_string ("Cannot unexec"), Fcons (errstring, data)));
 }
-

=== modified file 'src/unexw32.c'
--- a/src/unexw32.c     2011-03-16 23:59:54 +0000
+++ b/src/unexw32.c     2011-03-17 18:41:30 +0000
@@ -724,7 +724,7 @@
 
 
 /* Dump out .data and .bss sections into a new executable.  */
-int
+void
 unexec (const char *new_name, const char *old_name)
 {
   file_data in_file, out_file;
@@ -820,9 +820,6 @@
 
   close_file_data (&in_file);
   close_file_data (&out_file);
-
-  return 0;
 }
 
 /* eof */
-