Changeset 8565a42 in mainline for uspace/app/edit

Timestamp:

2018-03-02T20:34:50Z (8 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

a1a81f69, d5e5fd1

Parents:

3061bc1 (diff), 34e1206 (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.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:34:50)

git-committer:

GitHub <noreply@…> (2018-03-02 20:34:50)

Message:

Remove all trailing whitespace, everywhere.

See individual commit messages for details.

Location:

uspace/app/edit

Files:

• edit.c (modified) (19 diffs)
• search.c (modified) (8 diffs)
• sheet.c (modified) (1 diff)

uspace/app/edit/edit.c

@@ -89 +89 @@
          */
         int ideal_column;
-        
+
         char *previous_search;
         bool previous_search_reverse;
@@ -533 +533 @@
                 pane.rflags |= REDRAW_TEXT;
         }
-        
+
         if (update_ideal_column)
                 pane.ideal_column = c_new.column;
-        
+
         caret_update();
 }
@@ -609 +609 @@
         const char *old_fname = (doc.file_name != NULL) ? doc.file_name : "";
         char *fname;
-        
+
         fname = prompt("Save As", old_fname);
         if (fname == NULL) {
@@ -816 +816 @@
 
         /* Clear the remaining rows if file is short. */
-        
+
         int i;
         sysarg_t j;
@@ -906 +906 @@
                                 console_flush(con);
                         }
-        
+
                         if ((csel_end.row == rbc.row) && (csel_end.column == s_column)) {
                                 console_flush(con);
@@ -912 +912 @@
                                 console_flush(con);
                         }
-        
+
                         c = str_decode(row_buf, &pos, size);
                         if (c != '\t') {
@@ -1218 +1218 @@
         coord.row = row;
         coord.column = column;
-        
+
         spt_t pt;
         sheet_get_cell_pt(doc.sh, &coord, align_dir, &pt);
-        
+
         caret_move(pt, select, true);
 }
@@ -1263 +1263 @@
 {
         char *sline;
-        
+
         sline = prompt("Go to line", "");
         if (sline == NULL) {
@@ -1269 +1269 @@
                 return;
         }
-        
+
         char *endptr;
         int line = strtol(sline, &endptr, 10);
@@ -1278 +1278 @@
         }
         free(sline);
-        
+
         caret_move_absolute(line, pane.ideal_column, dir_before, false);
 }
@@ -1337 +1337 @@
 {
         char *pattern;
-        
+
         const char *prompt_text = "Find next";
         if (reverse)
                 prompt_text = "Find previous";
-        
+
         const char *default_value = "";
         if (pane.previous_search)
                 default_value = pane.previous_search;
-        
+
         pattern = prompt(prompt_text, default_value);
         if (pattern == NULL) {
@@ -1351 +1351 @@
                 return;
         }
-        
+
         if (pane.previous_search)
                 free(pane.previous_search);
         pane.previous_search = pattern;
         pane.previous_search_reverse = reverse;
-        
+
         search(pattern, reverse);
 }
@@ -1366 +1366 @@
                 return;
         }
-        
+
         search(pane.previous_search, pane.previous_search_reverse);
 }
@@ -1373 +1373 @@
 {
         status_display("Searching...");
-        
+
         spt_t sp, producer_pos;
         tag_get_pt(&pane.caret_pos, &sp);
-        
+
         /* Start searching on the position before/after caret */
         if (!reverse) {
@@ -1385 +1385 @@
         }
         producer_pos = sp;
-        
+
         search_ops_t ops = search_spt_ops;
         if (reverse)
                 ops = search_spt_reverse_ops;
-        
+
         search_t *search = search_init(pattern, &producer_pos, ops, reverse);
         if (search == NULL) {
@@ -1395 +1395 @@
                 return;
         }
-        
+
         match_t match;
         errno_t rc = search_next_match(search, &match);
@@ -1402 +1402 @@
                 search_fini(search);
         }
-        
+
         if (match.end) {
                 status_display("Match found.");
@@ -1423 +1423 @@
                 status_display("Not found.");
         }
-        
+
         search_fini(search);
 }
@@ -1716 +1716 @@
         console_set_pos(con, 0, scr_rows - 1);
         console_set_style(con, STYLE_INVERTED);
-        
+
         int pos = -(scr_columns - 3);
         printf(" %*s ", pos, str);

uspace/app/edit/search.c

@@ -49 +49 @@
         if (search == NULL)
                 return NULL;
-        
+
         wchar_t *p = str_to_awstr(pattern);
         if (p == NULL) {
@@ -55 +55 @@
                 return NULL;
         }
-        
+
         search->pattern_length = wstr_length(p);
-        
+
         if (reverse) {
                 /* Reverse the pattern */
@@ -68 +68 @@
                 }
         }
-        
+
         search->pattern = p;
-        
+
         search->client_data = client_data;
         search->ops = ops;
@@ -79 +79 @@
                 return NULL;
         }
-        
+
         search->pattern_pos = 0;
-        
+
         search->back_table[0] = -1;
         search->back_table[1] = 0;
@@ -101 +101 @@
                 }
         }
-        
+
         return search;
 }
@@ -108 +108 @@
 {
         search_equals_fn eq = s->ops.equals;
-        
+
         wchar_t cur_char;
         errno_t rc = EOK;
@@ -129 +129 @@
                 }
         }
-        
+
         match->end = NULL;
         match->length = 0;
-        
+
         return rc;
 }
@@ -140 +140 @@
         free(search->pattern);
         free(search->back_table);
-        
+
 }
 

uspace/app/edit/sheet.c

@@ -263 +263 @@
         coord.row = row;
         coord.column = 65536;
-        
+
         sheet_get_cell_pt(sh, &coord, dir_before, &pt);
         spt_get_coord(&pt, &coord);