Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make this build again: include <err.h> when needed, and don't

Browse Source 
shadow err() with a local variable called err...
This commit is contained in:
he 2011-09-22 16:05:11 +00:00
parent 8624929e77
commit 89071b8936
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
external/bsd/ntp/dist/libopts/compat/pathfind.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: pathfind.c,v 1.3 2011/09/22 12:40:48 christos Exp $ */
/* $NetBSD: pathfind.c,v 1.4 2011/09/22 16:05:11 he Exp $ */
/* -*- Mode: C -*- */
@ -14,6 +14,8 @@
/* Code: */
#include <err.h>
#include "compat.h"
#ifndef HAVE_PATHFIND

16
external/bsd/ntp/dist/libopts/configfile.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: configfile.c,v 1.2 2010/12/04 23:08:34 christos Exp $ */
/* $NetBSD: configfile.c,v 1.3 2011/09/22 16:05:11 he Exp $ */
/*
* Id: f1650b45a91ec95af830ff76041cc4f0048e60f0
@ -131,9 +131,9 @@ configFileLoad( char const* pzFile )
pRes = optionLoadNested(pzText, pzFile, strlen(pzFile));
if (pRes == NULL) {
int err = errno;
int e = errno;
text_munmap( &cfgfile );
errno = err;
errno = e;
} else
text_munmap( &cfgfile );
@ -376,7 +376,7 @@ optionNextValue(tOptionValue const * pOVList,tOptionValue const * pOldOV )
{
tArgList* pAL;
tOptionValue* pRes = NULL;
int err = EINVAL;
int e = EINVAL;
if ((pOVList == NULL) || (pOVList->valType != OPARG_TYPE_HIERARCHY)) {
errno = EINVAL;
@ -391,18 +391,18 @@ optionNextValue(tOptionValue const * pOVList,tOptionValue const * pOldOV )
tOptionValue* pNV = *(papNV++);
if (pNV == pOldOV) {
if (ct == 0) {
err = ENOENT;
e = ENOENT;
} else {
err = 0;
e = 0;
pRes = (tOptionValue*)*papNV;
}
break;
}
}
}
if (err != 0)
errno = err;
if (e != 0)
errno = e;
return pRes;
}