Changeset 1583793 in mainline

Timestamp:

2018-07-05T21:41:25Z (6 years ago)

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

6f025a8

Parents:

0d2bc9d

git-author:

Dzejrou <dzejrou@…> (2018-06-26 14:13:12)

git-committer:

Dzejrou <dzejrou@…> (2018-07-05 21:41:25)

Message:

c: fixed cstyle and removed leftover testing key combination

Location:

uspace/lib

Files:

• c/generic/str.c (modified) (1 diff)
• gui/terminal.c (modified) (1 diff)

uspace/lib/c/generic/str.c

@@ -1726 +1726 @@
                 *result = unsigned_result;
 
-        /* Check whether we are at the end of
-           the string in strict mode */
+        /*
+         * Check whether we are at the end of
+         * the string in strict mode
+         */
         if ((strict) && (*lendptr != 0))
                 return EINVAL;

uspace/lib/gui/terminal.c

@@ -417 +417 @@
                         cons_event_t *event = list_get_instance(link, cons_event_t, link);
 
-                        /* Ctrl-D inputs end-of-file. */
-                        if ((event->ev.key.mods & KM_LCTRL) != 0 &&
-                             event->ev.key.key == KC_D && event->ev.key.type == KEY_PRESS) {
-                                term->char_remains[term->char_remains_len] = EOF;
-                                term->char_remains_len = str_size(term->char_remains);
-
                         /* Accept key presses of printable chars only. */
-                        } else if (event->type == CEV_KEY && event->ev.key.type == KEY_PRESS &&
-                                   event->ev.key.c != 0) {
+                        if (event->type == CEV_KEY && event->ev.key.type == KEY_PRESS &&
+                            event->ev.key.c != 0) {
                                 wchar_t tmp[2] = {
                                         event->ev.key.c,