Change return value of kernel sys_* functions from int to long.

0bfd0187 · Silas Boyd-Wickizer · 373fa411 · 0bfd0187 · 0bfd0187 · 0bfd0187
--- a/syscall.c
+++ b/syscall.c
@@ -109,32 +109,32 @@ argstr(int n, char **pp)
  return fetchstr(addr, pp);
 }

-extern int sys_chdir(void);
-extern int sys_close(void);
-extern int sys_dup(void);
-extern int sys_exec(void);
-extern int sys_exit(void);
-extern int sys_fork(void);
-extern int sys_fstat(void);
-extern int sys_getpid(void);
-extern int sys_kill(void);
-extern int sys_link(void);
-extern int sys_mkdir(void);
-extern int sys_mknod(void);
-extern int sys_open(void);
-extern int sys_pipe(void);
-extern int sys_read(void);
-extern int sys_sbrk(void);
-extern int sys_sleep(void);
-extern int sys_unlink(void);
-extern int sys_wait(void);
-extern int sys_write(void);
-extern int sys_uptime(void);
-extern int sys_map(void);
-extern int sys_unmap(void);
-extern int sys_halt(void);
+extern long sys_chdir(void);
+extern long sys_close(void);
+extern long sys_dup(void);
+extern long sys_exec(void);
+extern long sys_exit(void);
+extern long sys_fork(void);
+extern long sys_fstat(void);
+extern long sys_getpid(void);
+extern long sys_kill(void);
+extern long sys_link(void);
+extern long sys_mkdir(void);
+extern long sys_mknod(void);
+extern long sys_open(void);
+extern long sys_pipe(void);
+extern long sys_read(void);
+extern long sys_sbrk(void);
+extern long sys_sleep(void);
+extern long sys_unlink(void);
+extern long sys_wait(void);
+extern long sys_write(void);
+extern long sys_uptime(void);
+extern long sys_map(void);
+extern long sys_unmap(void);
+extern long sys_halt(void);

-static int (*syscalls[])(void) = {
+static long (*syscalls[])(void) = {
  [SYS_chdir] =  sys_chdir,
  [SYS_close] =  sys_close,
  [SYS_dup] =    sys_dup,

--- a/sysfile.c
+++ b/sysfile.c
@@ -46,7 +46,7 @@ fdalloc(struct file *f)
  return -1;
 }

-int
+long
 sys_dup(void)
 {
  struct file *f;
@@ -60,7 +60,7 @@ sys_dup(void)
  return fd;
 }

-int
+s64
 sys_read(void)
 {
  struct file *f;
@@ -72,7 +72,7 @@ sys_read(void)
  return fileread(f, p, n);
 }

-int
+long
 sys_write(void)
 {
  struct file *f;
@@ -84,7 +84,7 @@ sys_write(void)
  return filewrite(f, p, n);
 }

-int
+long
 sys_close(void)
 {
  int fd;
@@ -97,7 +97,7 @@ sys_close(void)
  return 0;
 }

-int
+long
 sys_fstat(void)
 {
  struct file *f;
@@ -109,7 +109,7 @@ sys_fstat(void)
 }

 // Create the path new as a link to the same inode as old.
-int
+long
 sys_link(void)
 {
  char name[DIRSIZ], *new, *old;
@@ -164,8 +164,7 @@ isdirempty(struct inode *dp)
  return 1;
 }

-//PAGEBREAK!
-int
+long
 sys_unlink(void)
 {
  struct inode *ip, *dp;
@@ -271,7 +270,7 @@ create(char *path, short type, short major, short minor)
  return ip;
 }

-int
+long
 sys_open(void)
 {
  char *path;
@@ -319,7 +318,7 @@ sys_open(void)
  return fd;
 }

-int
+long
 sys_mkdir(void)
 {
  char *path;
@@ -331,7 +330,7 @@ sys_mkdir(void)
  return 0;
 }

-int
+long
 sys_mknod(void)
 {
  struct inode *ip;
@@ -348,7 +347,7 @@ sys_mknod(void)
  return 0;
 }

-int
+long
 sys_chdir(void)
 {
  char *path;
@@ -367,7 +366,7 @@ sys_chdir(void)
  return 0;
 }

-int
+long
 sys_exec(void)
 {
  char *path, *argv[MAXARG];
@@ -394,7 +393,7 @@ sys_exec(void)
  return exec(path, argv);
 }

-int
+long
 sys_pipe(void)
 {
  int *fd;

--- a/sysproc.c
+++ b/sysproc.c
@@ -9,7 +9,7 @@
 #include "cpu.h"
 #include "vm.h"

-int
+long
 sys_fork(void)
 {
  int flags;
@@ -19,20 +19,20 @@ sys_fork(void)
  return fork(flags);
 }

-int
+long
 sys_exit(void)
 {
  exit();
  return 0;  // not reached
 }

-int
+long
 sys_wait(void)
 {
  return wait();
 }

-int
+long
 sys_kill(void)
 {
  int pid;
@@ -42,13 +42,13 @@ sys_kill(void)
  return kill(pid);
 }

-int
+long
 sys_getpid(void)
 {
  return myproc()->pid;
 }

-int
+long
 sys_sbrk(void)
 {
  uptr addr;
@@ -62,7 +62,7 @@ sys_sbrk(void)
  return addr;
 }

-int
+long
 sys_sleep(void)
 {
  int n;
@@ -85,7 +85,7 @@ sys_sleep(void)

 // return how many clock tick interrupts have occurred
 // since boot.
-int
+long
 sys_uptime(void)
 {
  u64 xticks;
@@ -96,7 +96,7 @@ sys_uptime(void)
  return xticks;
 }

-int
+long
 sys_map(void)
 {
  uptr addr;
@@ -119,7 +119,7 @@ sys_map(void)
  return 0;
 }

-int
+long
 sys_unmap(void)
 {
  uptr addr;
@@ -144,7 +144,7 @@ sys_unmap(void)
  return 0;
 }

-int
+long
 sys_halt(void)
 {
  int i;