diff --git a/cde/programs/dtdocbook/infolib/DataBase.C b/cde/programs/dtdocbook/infolib/DataBase.C index e80a13bbb..dee8e3aa2 100644 --- a/cde/programs/dtdocbook/infolib/DataBase.C +++ b/cde/programs/dtdocbook/infolib/DataBase.C @@ -434,9 +434,9 @@ DBCursor::~DBCursor() //---------------------------------------------------------- -void DBCursor::string_field(FILE *fp, char **out, int *lenOut) +void DBCursor::string_field(FILE *fp, char **out, size_t *lenOut) { - int len = 0; + size_t len = 0; int io; /* fscanf is weird, so we do it ourselves... */ @@ -568,13 +568,13 @@ int DBCursor::next(int typeCode, ...) case STRING_CODE: { char **data = NULL; - int *len = NULL; + size_t *len = NULL; if (fieldCode == typeCode || (fieldCode + typeCode) == 0) { data = va_arg(ap, char**); if (fieldCode != typeCode) { - len = va_arg(ap, int*); + len = va_arg(ap, size_t*); } } diff --git a/cde/programs/dtdocbook/infolib/DataBase.h b/cde/programs/dtdocbook/infolib/DataBase.h index bc4661302..52d6a35da 100644 --- a/cde/programs/dtdocbook/infolib/DataBase.h +++ b/cde/programs/dtdocbook/infolib/DataBase.h @@ -170,7 +170,7 @@ class DBCursor{ void seekToRec( int pos ); /* seek directly to pos */ protected: - void string_field(FILE *, char **, int *); + void string_field(FILE *, char **, size_t *); void int_field(FILE *, int *); void short_list(FILE *, int *, int, void*); diff --git a/cde/programs/dtdocbook/infolib/NCFGen.C b/cde/programs/dtdocbook/infolib/NCFGen.C index c5101a35b..48371049f 100644 --- a/cde/programs/dtdocbook/infolib/NCFGen.C +++ b/cde/programs/dtdocbook/infolib/NCFGen.C @@ -71,9 +71,9 @@ writeStyleSheets(BookCaseDB& db) const char *name; const char *online; - int len_o; + size_t len_o; const char *print; - int len_p; + size_t len_p; int statusO = 0; int statusP = 0; @@ -98,8 +98,8 @@ writeStyleSheets(BookCaseDB& db) } out->insert(STRING_CODE, name, - -STRING_CODE, online, (size_t)len_o, - -STRING_CODE, print, (size_t)len_p, + -STRING_CODE, online, len_o, + -STRING_CODE, print, len_p, NULL); }