(a_write): Remove redundant semi-colons.

(e_write): Return -1 if failed to write all the data.
This fixes the changes made at 1999-12-15.

diff --git a/src/ChangeLog b/src/ChangeLog
index 5735930c967af03833c1ef5366315f69baaf3f0a..a1f51e3818be0d8852371fe0574ecd62a5b40e7a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2000-04-13  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * fileio.c (a_write): Remove redundant semi-colons.
+       (e_write): Return -1 if failed to write all the data.
+       This fixes the changes made at 1999-12-15.
+
 2000-04-12  Dave Love  <fx@gnu.org>
 
        * fns.c (mapcar1): Test for null vals to support mapc.

diff --git a/src/fileio.c b/src/fileio.c
index 3af7816fd5cd7dd643af870c64a5bed24942fb3b..545061ba0d10f401026b2223a3004ff53b708aca 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4925,7 +4925,7 @@ a_write (desc, string, pos, nchars, annot, coding)
       /* Output buffer text up to the next annotation's position.  */
       if (nextpos > pos)
        {
-         if (0 > e_write (desc, string, pos, nextpos, coding));
+         if (0 > e_write (desc, string, pos, nextpos, coding))
            return -1;
          pos = nextpos;
        }
@@ -4933,7 +4933,7 @@ a_write (desc, string, pos, nchars, annot, coding)
       tem = Fcdr (Fcar (*annot));
       if (STRINGP (tem))
        {
-         if (0 > e_write (desc, tem, 0, XSTRING (tem)->size, coding));
+         if (0 > e_write (desc, tem, 0, XSTRING (tem)->size, coding))
            return -1;
        }
       *annot = Fcdr (*annot);
@@ -5020,7 +5020,7 @@ e_write (desc, string, start, end, coding)
       if (coding->cmp_data)
        coding_adjust_composition_offset (coding, start);
     }
-  return 0;
+  return return_val;
 }
 \f
 DEFUN ("verify-visited-file-modtime", Fverify_visited_file_modtime,