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

constants.

Obtained from:	Nomad code
This commit is contained in:
Nate Williams
1996-06-17 22:30:30 +00:00
parent c1f5e49952
commit c40d042f0f
2 changed files with 11 additions and 11 deletions
+5 -5
View File
@@ -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);
}
/*
+6 -6
View File
@@ -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;