Changeset 70253688 in mainline for uspace/app

Timestamp:

2012-09-07T08:12:05Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

e0c836e8

Parents:

131d9a4 (diff), 8cf4823 (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

Location:

uspace/app

Files:

• bdsh/errors.h (modified) (2 diffs)
• bdsh/input.c (modified) (3 diffs)
• edit/edit.c (modified) (3 diffs)
• top/screen.h (modified) (2 diffs)

uspace/app/bdsh/errors.h

@@ -30 +30 @@
 #define ERRORS_H
 
+#include <io/verify.h>
+
 /* Various error levels */
 #define CL_EFATAL  -1
@@ -46 +48 @@
 extern volatile int cli_errno;
 
-extern void cli_error(int, const char *, ...);
+extern void cli_error(int, const char *, ...)
+    PRINTF_ATTRIBUTE(2, 3);
 
 #endif

uspace/app/bdsh/input.c

@@ -67 +67 @@
 int process_input(cliuser_t *usr)
 {
-        token_t *tokens = calloc(WORD_MAX, sizeof(token_t));
-        if (tokens == NULL)
+        token_t *tokens_buf = calloc(WORD_MAX, sizeof(token_t));
+        if (tokens_buf == NULL)
                 return ENOMEM;
+        token_t *tokens = tokens_buf;
         
         char *cmd[WORD_MAX];
@@ -80 +81 @@
 
         if (usr->line == NULL) {
-                free(tokens);
+                free(tokens_buf);
                 return CL_EFAIL;
         }
@@ -213 +214 @@
         }
         tok_fini(&tok);
-        free(tokens);
+        free(tokens_buf);
 
         return rc;

uspace/app/edit/edit.c

@@ -111 +111 @@
 #define BUF_SIZE 64
 #define TAB_WIDTH 8
-#define ED_INFTY 65536
 
 /** Maximum filename length that can be entered. */
@@ -507 +506 @@
 static void key_handle_movement(unsigned int key, bool select)
 {
+        spt_t pt;
         switch (key) {
         case KC_LEFT:
@@ -521 +521 @@
                 break;
         case KC_HOME:
-                caret_move_relative(0, -ED_INFTY, dir_after, select);
+                tag_get_pt(&pane.caret_pos, &pt);
+                pt_get_sol(&pt, &pt);
+                caret_move(pt, select, true);
                 break;
         case KC_END:
-                caret_move_relative(0, +ED_INFTY, dir_before, select);
+                tag_get_pt(&pane.caret_pos, &pt);
+                pt_get_eol(&pt, &pt);
+                caret_move(pt, select, true);
                 break;
         case KC_PAGE_UP:

uspace/app/top/screen.h

@@ -36 +36 @@
 
 #include <io/console.h>
+#include <io/verify.h>
 #include "top.h"
 
@@ -43 +44 @@
 extern void screen_done(void);
 extern void print_data(data_t *);
-extern void show_warning(const char *, ...);
+extern void show_warning(const char *, ...)
+    PRINTF_ATTRIBUTE(1, 2);
 
 extern int tgetchar(unsigned int);