Module Name: src
Committed By: dholland
Date: Sat Jun 11 06:22:11 UTC 2016
Modified Files:
src/sys/arch/hp300/stand/common: samachdep.h tgets.c
src/sys/arch/hp300/stand/uboot: uboot.c
Log Message:
Change "tgets_s" back to "tgets". We obviously want to keep the bounds
argument, but there's no need to mess with the function name.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/hp300/stand/common/samachdep.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hp300/stand/common/tgets.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/hp300/stand/uboot/uboot.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp300/stand/common/samachdep.h
diff -u src/sys/arch/hp300/stand/common/samachdep.h:1.19 src/sys/arch/hp300/stand/common/samachdep.h:1.20
--- src/sys/arch/hp300/stand/common/samachdep.h:1.19 Sun Jun 5 17:43:02 2016
+++ src/sys/arch/hp300/stand/common/samachdep.h Sat Jun 11 06:22:11 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: samachdep.h,v 1.19 2016/06/05 17:43:02 christos Exp $ */
+/* $NetBSD: samachdep.h,v 1.20 2016/06/11 06:22:11 dholland Exp $ */
/*
* Copyright (c) 1982, 1990, 1993
@@ -98,7 +98,7 @@ void romout(int, char *);
void _transfer(char *, int, int, int, char *, char *);
/* tget.c */
-int tgets_s(char *, size_t);
+int tgets(char *, size_t);
#define DELAY(n) \
Index: src/sys/arch/hp300/stand/common/tgets.c
diff -u src/sys/arch/hp300/stand/common/tgets.c:1.7 src/sys/arch/hp300/stand/common/tgets.c:1.8
--- src/sys/arch/hp300/stand/common/tgets.c:1.7 Thu Jun 9 03:05:54 2016
+++ src/sys/arch/hp300/stand/common/tgets.c Sat Jun 11 06:22:11 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: tgets.c,v 1.7 2016/06/09 03:05:54 christos Exp $ */
+/* $NetBSD: tgets.c,v 1.8 2016/06/11 06:22:11 dholland Exp $ */
/*-
* Copyright (c) 1993
@@ -38,7 +38,7 @@
#include <hp300/stand/common/samachdep.h>
int
-tgets_s(char *buf, size_t size)
+tgets(char *buf, size_t size)
{
int c;
int i;
Index: src/sys/arch/hp300/stand/uboot/uboot.c
diff -u src/sys/arch/hp300/stand/uboot/uboot.c:1.16 src/sys/arch/hp300/stand/uboot/uboot.c:1.17
--- src/sys/arch/hp300/stand/uboot/uboot.c:1.16 Sun Jun 5 17:43:02 2016
+++ src/sys/arch/hp300/stand/uboot/uboot.c Sat Jun 11 06:22:11 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: uboot.c,v 1.16 2016/06/05 17:43:02 christos Exp $ */
+/* $NetBSD: uboot.c,v 1.17 2016/06/11 06:22:11 dholland Exp $ */
/*-
* Copyright (c) 1982, 1986, 1990, 1993
@@ -109,7 +109,7 @@ getbootdev(int *howto)
printf("Boot: [[[%s%d%c:]%s][-a][-c][-d][-s][-v][-q]] :- ",
devsw[bdev].dv_name, bctlr + (8 * badapt), 'a' + bpart, name);
- if (tgets_s(line, sizeof(line))) {
+ if (tgets(line, sizeof(line))) {
if (strcmp(line, "reset") == 0) {
call_req_reboot(); /* reset machine */
printf("panic: can't reboot, halting\n");
