Prepend the CIS string length define with CIS_ per the rest of the

constants.

Obtained from:	Nomad code

2 files changed, 11 insertions, 11 deletions

diff --git a/usr.sbin/pccard/pccardd/readcis.c b/usr.sbin/pccard/pccardd/readcis.c
index b77ebd1..4dae77e 100644
--- a/usr.sbin/pccard/pccardd/readcis.c
+++ b/usr.sbin/pccard/pccardd/readcis.c
@@ -23,7 +23,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$
+ * $Id: readcis.c,v 1.4 1996/04/18 04:25:15 nate Exp $
  */
 #include <stdio.h>
 #include <unistd.h>
@@ -164,13 +164,13 @@ cis_info(struct cis *cp, unsigned char *p, int len)
 {
 	cp->maj_v = *p++;
 	cp->min_v = *p++;
-	strncpy(cp->manuf, p, MAXSTR - 1);
+	strncpy(cp->manuf, p, CIS_MAXSTR - 1);
 	while (*p++);
-	strncpy(cp->vers, p, MAXSTR - 1);
+	strncpy(cp->vers, p, CIS_MAXSTR - 1);
 	while (*p++);
-	strncpy(cp->add_info1, p, MAXSTR - 1);
+	strncpy(cp->add_info1, p, CIS_MAXSTR - 1);
 	while (*p++);
-	strncpy(cp->add_info2, p, MAXSTR - 1);
+	strncpy(cp->add_info2, p, CIS_MAXSTR - 1);
 }
 
 /*
diff --git a/usr.sbin/pccard/pccardd/readcis.h b/usr.sbin/pccard/pccardd/readcis.h
index 29b2a4f..39c4bf2 100644
--- a/usr.sbin/pccard/pccardd/readcis.h
+++ b/usr.sbin/pccard/pccardd/readcis.h
@@ -23,10 +23,10 @@
  * (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$
+ * $Id: readcis.h,v 1.3 1996/04/18 04:25:16 nate Exp $
  */
 
-#define	MAXSTR	20
+#define	CIS_MAXSTR	20
 struct tuple {
 	struct tuple *next;
 	unsigned char code;
@@ -111,10 +111,10 @@ struct cis_config {
  */
 struct cis {
 	struct tuple_list *tlist;
-	char    manuf[MAXSTR];
-	char    vers[MAXSTR];
-	char    add_info1[MAXSTR];
-	char    add_info2[MAXSTR];
+	char    manuf[CIS_MAXSTR];
+	char    vers[CIS_MAXSTR];
+	char    add_info1[CIS_MAXSTR];
+	char    add_info2[CIS_MAXSTR];
 	unsigned char maj_v, min_v;
 	unsigned char last_config;
 	unsigned char ccrs;