Skip to content

X
xv6-public
提交 7f419a0d 创建 作者: rsc's avatar rsc
浏览文件
操作

Change fetchint, fetcharg, and putint to return -1 on error, 0 on success.

They had been returning 0 on error, 1 on success, but all the callers were checking for return value < 0.
上级 46bbd72f
隐藏空白字符变更
内嵌 并排
正在显示 包含 5 行增加 和 5 行删除
syscall.c
浏览文件 @ 7f419a0d
...@@ -23,7 +23,7 @@ extern struct spinlock proc_table_lock; ...@@ -23,7 +23,7 @@ extern struct spinlock proc_table_lock;
/* /*
* fetch 32 bits from a user-supplied pointer. * fetch 32 bits from a user-supplied pointer.
* returns 1 if addr was OK, 0 if illegal. * returns 0 if addr was OK, -1 if illegal.
*/ */
int int
fetchint(struct proc *p, unsigned addr, int *ip) fetchint(struct proc *p, unsigned addr, int *ip)
...@@ -31,9 +31,9 @@ fetchint(struct proc *p, unsigned addr, int *ip) ...@@ -31,9 +31,9 @@ fetchint(struct proc *p, unsigned addr, int *ip)
*ip = 0; *ip = 0;
if(addr > p->sz - 4) if(addr > p->sz - 4)
return 0; return -1;
memcpy(ip, p->mem + addr, 4); memcpy(ip, p->mem + addr, 4);
return 1; return 0;
} }
int int
...@@ -49,9 +49,9 @@ int ...@@ -49,9 +49,9 @@ int
putint(struct proc *p, unsigned addr, int ip) putint(struct proc *p, unsigned addr, int ip)
{ {
if(addr > p->sz - 4) if(addr > p->sz - 4)
return 0; return -1;
memcpy(p->mem + addr, &ip, 4); memcpy(p->mem + addr, &ip, 4);
return 1; return 0;
} }
int int
......
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论