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

Timestamp:

2018-05-10T13:39:19Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

e8975278

Parents:

b277bef

git-author:

Jiri Svoboda <jiri@…> (2018-05-10 07:38:12)

git-committer:

Jiri Svoboda <jiri@…> (2018-05-10 13:39:19)

Message:

Selected ccheck-proposed comment fixes.

File:

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

uspace/app/edit/edit.c

@@ -292 +292 @@
         if (((ev->mods & KM_ALT) == 0) &&
             ((ev->mods & KM_SHIFT) == 0) &&
-             (ev->mods & KM_CTRL) != 0) {
+            (ev->mods & KM_CTRL) != 0) {
                 key_handle_ctrl(ev);
         } else if (((ev->mods & KM_ALT) == 0) &&
             ((ev->mods & KM_CTRL) == 0) &&
-             (ev->mods & KM_SHIFT) != 0) {
+            (ev->mods & KM_SHIFT) != 0) {
                 key_handle_shift(ev);
         } else if (((ev->mods & KM_ALT) == 0) &&
             ((ev->mods & KM_CTRL) != 0) &&
-             (ev->mods & KM_SHIFT) != 0) {
+            (ev->mods & KM_SHIFT) != 0) {
                 key_handle_shift_ctrl(ev);
         } else if ((ev->mods & (KM_CTRL | KM_ALT | KM_SHIFT)) == 0) {
@@ -458 +458 @@
 {
         spt_t pt;
-        switch(ev->key) {
+        switch (ev->key) {
         case KC_LEFT:
                 caret_move_word_left(true);
@@ -915 +915 @@
                                 s_column += 1;
                         } else {
-                                fill = 1 + ALIGN_UP(s_column, TAB_WIDTH)
-                                    - s_column;
+                                fill = 1 + ALIGN_UP(s_column, TAB_WIDTH) -
+                                    s_column;
 
                                 for (j = 0; j < fill; ++j)
@@ -1169 +1169 @@
         tag_get_pt(&pane.caret_pos, &pt);
         spt_get_coord(&pt, &coord);
-        coord.row += drow; coord.column += dcolumn;
+        coord.row += drow;
+        coord.column += dcolumn;
 
         /* Clamp coordinates. */
-        if (drow < 0 && coord.row < 1) coord.row = 1;
+        if (drow < 0 && coord.row < 1)
+                coord.row = 1;
         if (dcolumn < 0 && coord.column < 1) {
                 if (coord.row < 2)
@@ -1183 +1185 @@
         if (drow > 0) {
                 sheet_get_num_rows(doc.sh, &num_rows);
-                if (coord.row > num_rows) coord.row = num_rows;
+                if (coord.row > num_rows)
+                        coord.row = num_rows;
         }
 
@@ -1377 +1380 @@
         if (!reverse) {
                 spt_next_char(sp, &sp);
-        }
-        else {
+        } else {
                 spt_prev_char(sp, &sp);
         }
@@ -1409 +1411 @@
                         if (reverse) {
                                 spt_next_char(*end, end);
-                        }
-                        else {
+                        } else {
                                 spt_prev_char(*end, end);
                         }
@@ -1416 +1417 @@
                 caret_move(*end, true, true);
                 free(end);
-        }
-        else {
+        } else {
                 status_display("Not found.");
         }
@@ -1589 +1589 @@
 
         /* the spt is at the beginning or end of the file or line */
-        if ((spt_cmp(&sfp, pt) == 0) || (spt_cmp(&efp, pt) == 0)
-            || (spt_cmp(&slp, pt) == 0) || (spt_cmp(&elp, pt) == 0))
+        if ((spt_cmp(&sfp, pt) == 0) || (spt_cmp(&efp, pt) == 0) ||
+            (spt_cmp(&slp, pt) == 0) || (spt_cmp(&elp, pt) == 0))
                 return true;
 
@@ -1602 +1602 @@
         sheet_get_cell_pt(doc.sh, &coord, dir_before, &lp);
 
-        return pt_is_delimiter(&lp)
-            || (pt_is_punctuation(pt) && !pt_is_punctuation(&lp))
-            || (pt_is_punctuation(&lp) && !pt_is_punctuation(pt));
+        return pt_is_delimiter(&lp) ||
+            (pt_is_punctuation(pt) && !pt_is_punctuation(&lp)) ||
+            (pt_is_punctuation(&lp) && !pt_is_punctuation(pt));
 }
 
@@ -1629 +1629 @@
 
         wchar_t first_char = get_first_wchar(ch);
-        switch(first_char) {
+        switch (first_char) {
         case ' ':
         case '\t':
@@ -1655 +1655 @@
 
         wchar_t first_char = get_first_wchar(ch);
-        switch(first_char) {
+        switch (first_char) {
         case ',':
         case '.':