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

Fixed build of LINT yet again. getchar() clashed with getchar() in pcvt.

Browse Source 
Staticized it in userconfig.  The one in pcvt is unused.

Removed bogus unused arg to getchar().  This should not have compiled
in the USERCONFIG_BOOT case, but the getchar() was also non-prototyped
and defined in K&R style.

Staticized the badly named global variable `next'.  Even static variables
should have a unique module-specific prefix so that they can be referenced
easily in debuggers, etc.
This commit is contained in:
bde 1996-10-06 16:30:15 +00:00
parent a761e29d9a
commit 5d54c37e3b
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/i386/i386/userconfig.c
View File

@ -46,7 +46,7 @@
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
**
** $Id: userconfig.c,v 1.54 1996/10/06 10:15:27 jkh Exp $
** $Id: userconfig.c,v 1.55 1996/10/06 15:27:36 davidg Exp $
**/
/**
@ -121,13 +121,14 @@
static struct isa_device *isa_devlist; /* list read by dset to extract changes */
#ifdef USERCONFIG_BOOT
char userconfig_from_boot[512] = "";
char *next = userconfig_from_boot;
int
getchar(x)
static int
getchar(void)
{
static char *next = userconfig_from_boot;
if (next == userconfig_from_boot) {
if (strncmp(next, "USERCONFIG\n", 11)) {
next++;
@ -2211,7 +2212,7 @@ visuserconfig(void)
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: userconfig.c,v 1.54 1996/10/06 10:15:27 jkh Exp $
* $Id: userconfig.c,v 1.55 1996/10/06 15:27:36 davidg Exp $
*/
#include "scbus.h"