Changeset 7715994 in mainline for uspace/app/edit/edit.c

Timestamp:

2010-03-13T12:17:02Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6ba20a6b

Parents:

d0febca (diff), 2070570 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/app/edit/edit.c (modified) (3 diffs)

uspace/app/edit/edit.c

@@ -475 +475 @@
 static void file_save_as(void)
 {
-        char *old_fname, *fname;
-        int rc;
-
-        old_fname = (doc.file_name != NULL) ? doc.file_name : "";
+        const char *old_fname = (doc.file_name != NULL) ? doc.file_name : "";
+        char *fname;
+        
         fname = filename_prompt("Save As", old_fname);
         if (fname == NULL) {
@@ -485 +484 @@
         }
 
-        rc = file_save(fname);
+        int rc = file_save(fname);
         if (rc != EOK)
                 return;
@@ -819 +818 @@
         spt_t caret_pt;
         coord_t coord;
-        char *fname;
-        int n;
 
         tag_get_pt(&pane.caret_pos, &caret_pt);
         spt_get_coord(&caret_pt, &coord);
 
-        fname = (doc.file_name != NULL) ? doc.file_name : "<unnamed>";
+        const char *fname = (doc.file_name != NULL) ? doc.file_name : "<unnamed>";
 
         console_goto(con, 0, scr_rows - 1);
         console_set_color(con, COLOR_WHITE, COLOR_BLACK, 0);
-        n = printf(" %d, %d: File '%s'. Ctrl-Q Quit  Ctrl-S Save  "
+        int n = printf(" %d, %d: File '%s'. Ctrl-Q Quit  Ctrl-S Save  "
             "Ctrl-E Save As", coord.row, coord.column, fname);
         printf("%*s", scr_columns - 1 - n, "");