浏览代码

Terminal: Fix compiler warnings.

Andreas Kling 6 年之前
父节点
当前提交
4118aaaa32
共有 2 个文件被更改,包括 4 次插入4 次删除
  1. 1 1
      Applications/Terminal/Terminal.cpp
  2. 3 3
      Applications/Terminal/main.cpp

+ 1 - 1
Applications/Terminal/Terminal.cpp

@@ -290,7 +290,7 @@ void Terminal::escape$r(const ParamVector& params)
         top = params[0];
     if (params.size() >= 2)
         bottom = params[1];
-    if ((bottom - top) < 2 || bottom > m_rows || top < 0) {
+    if ((bottom - top) < 2 || bottom > m_rows) {
         dbgprintf("Error: escape$r: scrolling region invalid: %u-%u\n", top, bottom);
         return;
     }

+ 3 - 3
Applications/Terminal/main.cpp

@@ -70,9 +70,9 @@ static void make_shell(int ptm_fd)
             perror("ioctl(TIOCSCTTY)");
             exit(1);
         }
-        char* args[] = { "/bin/Shell", nullptr };
-        char* envs[] = { "TERM=xterm", "PATH=/bin:/usr/bin:/usr/local/bin", nullptr };
-        rc = execve("/bin/Shell", args, envs);
+        const char* args[] = { "/bin/Shell", nullptr };
+        const char* envs[] = { "TERM=xterm", "PATH=/bin:/usr/bin:/usr/local/bin", nullptr };
+        rc = execve("/bin/Shell", const_cast<char**>(args), const_cast<char**>(envs));
         if (rc < 0) {
             perror("execve");
             exit(1);