more miscellaneous minor fixes

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4031 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 48da84b6996c5c1042788c076d14043574231a9f..acbb3820ddb2eb685f1806e7fc45cb9884cd5e0a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,10 @@ CVS code -
   regexp_init()
        - Don't assign rc's value via regcomp() until we've asserted
          that regexp_compiled is FALSE. (DLR)
+- text.c:
+  do_alt_speller()
+       - Rename variable altspell_error to alt_spell_error, for
+         consistency. (DLR)
 - winio.c:
   do_credits()
        - Update the last copyright notice to include 2006. (DLR)

diff --git a/src/files.c b/src/files.c
index d5ac344e22411aec25bcfe8218087f6462ce11b1..f697a79114fcd9b542586751a4478b32b0063628 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -1701,7 +1701,7 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
 bool write_marked_file(const char *name, FILE *f_open, bool tmp,
        append_type append)
 {
-    bool retval = FALSE;
+    bool retval;
     bool old_modified = openfile->modified;
        /* write_file() unsets the modified flag. */
     bool added_magicline = FALSE;

diff --git a/src/nano.c b/src/nano.c
index 4cbe8933319df2c17a6ee4596757cdbd5d7149ef..19516e75f70bd5e14c06e848660ee79fbb4dbf4f 100644 (file)
--- a/src/nano.c
+++ b/src/nano.c
@@ -613,8 +613,7 @@ void die_save_file(const char *die_filename)
 
     retval = get_next_filename(die_filename, ".save");
     if (retval[0] != '\0')
-       failed = (write_file(retval, NULL, TRUE, OVERWRITE,
-               TRUE) == -1);
+       failed = (!write_file(retval, NULL, TRUE, OVERWRITE, TRUE));
 
     if (!failed)
        fprintf(stderr, _("\nBuffer written to %s\n"), retval);

diff --git a/src/text.c b/src/text.c
index 3604894f4b763d91e23a075926c2645411111d6f..e9f548fa949d338cdf404ff262afd9601c290e16 100644 (file)
--- a/src/text.c
+++ b/src/text.c
@@ -2197,7 +2197,7 @@ const char *do_alt_speller(char *tempfile_name)
 
     if (!WIFEXITED(alt_spell_status) ||
                WEXITSTATUS(alt_spell_status) != 0) {
-       char *altspell_error;
+       char *alt_spell_error;
        char *invoke_error = _("Error invoking \"%s\"");
 
 #ifndef NANO_TINY
@@ -2205,11 +2205,11 @@ const char *do_alt_speller(char *tempfile_name)
        openfile->mark_set = old_mark_set;
 #endif
 
-       altspell_error =
+       alt_spell_error =
                charalloc(strlen(invoke_error) +
                strlen(alt_speller) + 1);
-       sprintf(altspell_error, invoke_error, alt_speller);
-       return altspell_error;
+       sprintf(alt_spell_error, invoke_error, alt_speller);
+       return alt_spell_error;
     }
 
 #ifndef NANO_TINY
@@ -2301,7 +2301,7 @@ const char *do_alt_speller(char *tempfile_name)
  * specified, use it.  Otherwise, use the internal spell checker. */
 void do_spell(void)
 {
-    int i;
+    bool status;
     FILE *temp_file;
     char *temp = safe_tempfile(&temp_file);
     const char *spell_msg;
@@ -2311,14 +2311,14 @@ void do_spell(void)
        return;
     }
 
-    i =
+    status =
 #ifndef NANO_TINY
        (openfile->mark_set) ? write_marked_file(temp, temp_file, TRUE,
        OVERWRITE) :
 #endif
        write_file(temp, temp_file, TRUE, OVERWRITE, FALSE);
 
-    if (i == -1) {
+    if (!status) {
        statusbar(_("Error writing temp file: %s"), strerror(errno));
        free(temp);
        return;