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

Timestamp:

2009-09-13T23:41:37Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

99e5526, c35aabe

Parents:

3052ff4 (diff), 2ac62cf (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

@@ -88 +88 @@
 static pane_t pane;
 
-static ipcarg_t scr_rows, scr_columns;
+static int scr_rows, scr_columns;
 
 #define ROW_BUF_SIZE 4096
@@ -362 +362 @@
 {
         int sh_rows, rows;
-        int i;
-        unsigned j;
+        int i, j;
 
         sheet_get_num_rows(&doc.sh, &sh_rows);
@@ -452 +451 @@
                 /* Fill until the end of display area. */
 
-                if (str_length(row_buf) < scr_columns)
+                if (str_length(row_buf) < (unsigned) scr_columns)
                         fill = scr_columns - str_length(row_buf);
                 else