d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reviewed by: William LeFebvre <wnl@groupsys.com>

Browse Source 
Change errno -> error in local structure to avoid a clash with the
thread-aware version of errno which is required for a thread-safe libc.

Have discussed this with the author and he has agreed to this change. 8-)
This commit is contained in:
John Birrell 1997-12-22 19:39:20 +00:00
parent 0832039284
commit f1129700ee
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/top/commands.c
View File

@ -153,7 +153,7 @@ int *intp;
struct errs /* structure for a system-call error */
{
int errno; /* value of errno (that is, the actual error) */
int error; /* value of errno (that is, the actual error) */
char *arg; /* argument that caused the error */
};
@ -172,7 +172,7 @@ static char *err_listem =
else \
{ \
errs[errcnt].arg = (p); \
errs[errcnt++].errno = (e); \
errs[errcnt++].error = (e); \
}
/*
@ -212,7 +212,7 @@ char *err_string()
while (cnt < errcnt)
{
errp = &(errs[cnt++]);
if (errp->errno != currerr)
if (errp->error != currerr)
{
if (currerr != -1)
{
@ -222,7 +222,7 @@ char *err_string()
}
(void) strcat(string, "; "); /* we know there's more */
}
currerr = errp->errno;
currerr = errp->error;
first = Yes;
}
if ((stringlen = str_addarg(string, stringlen, errp->arg, first)) ==0)
@ -310,7 +310,7 @@ register struct errs *p1, *p2;
{
register int result;
if ((result = p1->errno - p2->errno) == 0)
if ((result = p1->error - p2->error) == 0)
{
return(strcmp(p1->arg, p2->arg));
}
@ -341,7 +341,7 @@ show_errors()
while (cnt++ < errcnt)
{
printf("%5s: %s\n", errp->arg,
errp->errno == 0 ? "Not a number" : errmsg(errp->errno));
errp->error == 0 ? "Not a number" : errmsg(errp->error));
errp++;
}
}