消除keil报错

vi.c

@@ -547,8 +547,7 @@ static int vi_main(int argc, char **argv)
             show_help();
             // fall through
         default:
-            bb_show_usage();
-            FREE_PTR_TO_GLOBALS(); // RT-Thread team added
+            printf("Usage: vi [FILE]\n"); /*bb_show_usage();*/
             return 1;
         }
     }
@@ -2038,7 +2037,7 @@ static int find_range(char **start, char **stop, char c)
         do_cmd(c);      // execute movement cmd
     } else if (c == ' ' || c == 'l') {
         // forward motion by character
-        int tmpcnt = (cmdcnt ?: 1);
+        int tmpcnt = (cmdcnt ? cmdcnt : 1);
         buftype = PARTIAL;
         do_cmd(c);      // execute movement cmd
         // exclude last char unless range isn't what we expected
@@ -2812,7 +2811,7 @@ static int get_motion_char(void)
         // get any non-zero motion count
         for (cnt = 0; isdigit(c); c = get_one_char())
             cnt = cnt * 10 + (c - '0');
-        cmdcnt = (cmdcnt ?: 1) * cnt;
+        cmdcnt = (cmdcnt ? cmdcnt : 1) * cnt;
     }
 
     return c;
@@ -3731,7 +3730,6 @@ static void do_cmd(int c)
             p = dot + 1;
         }
         goto dc4;       // now search for pattern
-        break;
     case 'n':           // n- repeat search for last pattern
         // search rest of text[] starting at next char
         // if search fails return orignal "p" not the "p+1" address
@@ -3851,7 +3849,6 @@ static void do_cmd(int c)
         if (*dot != '\n')
             dot++;
         goto dc_i;
-        break;
     case 'B':           // B- back a blank-delimited Word
     case 'E':           // E- end of a blank-delimited word
     case 'W':           // W- forward a blank-delimited word
@@ -3972,7 +3969,6 @@ static void do_cmd(int c)
             dot_prev(); // -
         }
         goto dc_i;
-        break;
     case 'R':           // R- continuous Replace char
  dc5:
         cmd_mode = 2;

vi_utils.c

@@ -262,11 +262,6 @@ char *xstrndup(const char *s, size_t n)
     return mem_sandbox_strndup(vi_sandbox, s, n);
 }
 
-void bb_show_usage(void)
-{
-    printf("Usage: vi [FILE]\n");
-}
-
 int64_t read_key(int fd, char *buffer, int timeout)
 {
     struct pollfd pfd;

vi_utils.h

@@ -257,17 +257,10 @@
 
 /*----------------------------------------------------------------*/
 
-#define ENABLE_FEATURE_CLEAN_UP 1
-
 #define SET_PTR_TO_GLOBALS(x) do { \
     (*(struct globals**)&ptr_to_globals) = (void*)(x); \
     barrier(); \
 } while (0)
-#define FREE_PTR_TO_GLOBALS() do { \
-    if (ENABLE_FEATURE_CLEAN_UP) { \
-        xfree(ptr_to_globals); \
-    } \
-} while (0)
 
 /* "Keycodes" that report an escape sequence.
  * We use something which fits into signed char,
@@ -356,7 +349,6 @@ void xfree(void *ptr);
 void* xzalloc(size_t size);
 char *xstrdup(const char *s);
 char *xstrndup(const char *s, size_t n);
-void bb_show_usage(void);
 int64_t read_key(int fd, char *buffer, int timeout);
 void *memrchr(const void* ptr, int ch, size_t pos);