xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

syscallfmt: use up->syserrstr instead of up->errstr (import from sources)

Browse source
This commit is contained in:
cinap_lenrek 2012-08-24 15:53:35 +02:00
parent da01fdae11
commit 3ac4524e4a
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
sys/src/9/port/syscallfmt.c
View file

@ -322,15 +322,11 @@ sysretfmt(int syscallno, va_list list, long ret, uvlong start, uvlong stop)
errstr = "\"\""; errstr = "\"\"";
switch(syscallno){ switch(syscallno){
default: default:
if(ret == -1)
errstr = up->errstr;
fmtprint(&fmt, " = %ld", ret);
break;
case ALARM: case ALARM:
case _WRITE: case _WRITE:
case PWRITE: case PWRITE:
if(ret == -1) if(ret == -1)
errstr = up->errstr; errstr = up->syserrstr;
fmtprint(&fmt, " = %ld", ret); fmtprint(&fmt, " = %ld", ret);
break; break;
case EXEC: case EXEC:
@ -338,7 +334,7 @@ sysretfmt(int syscallno, va_list list, long ret, uvlong start, uvlong stop)
case SEGATTACH: case SEGATTACH:
case RENDEZVOUS: case RENDEZVOUS:
if((void *)ret == (void*)-1) if((void *)ret == (void*)-1)
errstr = up->errstr; errstr = up->syserrstr;
fmtprint(&fmt, " = %#p", (void *)ret); fmtprint(&fmt, " = %#p", (void *)ret);
break; break;
case AWAIT: case AWAIT:
@ -350,7 +346,7 @@ sysretfmt(int syscallno, va_list list, long ret, uvlong start, uvlong stop)
} }
else{ else{
fmtprint(&fmt, "%#p/\"\" %lud = %ld", a, l, ret); fmtprint(&fmt, "%#p/\"\" %lud = %ld", a, l, ret);
errstr = up->errstr; errstr = up->syserrstr;
} }
break; break;
case _ERRSTR: case _ERRSTR:
@ -366,7 +362,7 @@ sysretfmt(int syscallno, va_list list, long ret, uvlong start, uvlong stop)
} }
else{ else{
fmtprint(&fmt, "\"\" %lud = %ld", l, ret); fmtprint(&fmt, "\"\" %lud = %ld", l, ret);
errstr = up->errstr; errstr = up->syserrstr;
} }
break; break;
case FD2PATH: case FD2PATH:
@ -380,7 +376,7 @@ sysretfmt(int syscallno, va_list list, long ret, uvlong start, uvlong stop)
} }
else{ else{
fmtprint(&fmt, "\"\" %lud = %ld", l, ret); fmtprint(&fmt, "\"\" %lud = %ld", l, ret);
errstr = up->errstr; errstr = up->syserrstr;
} }
break; break;
case _READ: case _READ:
@ -395,7 +391,7 @@ sysretfmt(int syscallno, va_list list, long ret, uvlong start, uvlong stop)
} }
else{ else{
fmtprint(&fmt, "/\"\""); fmtprint(&fmt, "/\"\"");
errstr = up->errstr; errstr = up->syserrstr;
} }
fmtprint(&fmt, " %ld", l); fmtprint(&fmt, " %ld", l);
if(syscallno == PREAD){ if(syscallno == PREAD){