external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-13 19:52:20 +00:00
Code Issues Releases Wiki Activity

libDtHelp: fix up some warnigs and potential overruns

Browse source
This commit is contained in:
Jon Trulson 2012-07-12 18:03:54 -06:00
parent aeaec445ee
commit 75f2f96793
2 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
cde/lib/DtHelp/FormatSDL.c
View file

@ -1219,10 +1219,10 @@ static SDLAttribute SDLAttributeList[] =
{ "app" , SdlAttrDataTypeEnum , SdlIgnore , { "app" , SdlAttrDataTypeEnum , SdlIgnore ,
SDL_ATTR_APP , SDL_ATTR_APP ,
NULL }, 0 },
{ "author" , SdlAttrDataTypeCdata , SdlIgnore , { "author" , SdlAttrDataTypeCdata , SdlIgnore ,
SDL_ATTR_AUTHOR , SDL_ATTR_AUTHOR ,
NULL }, 0 },
{ "b-margin" , SdlAttrDataTypeNumber, SdlContainerSpecific , { "b-margin" , SdlAttrDataTypeNumber, SdlContainerSpecific ,
SDL_ATTR_BMARGIN, SDL_ATTR_BMARGIN,
@ -1236,7 +1236,7 @@ static SDLAttribute SDLAttributeList[] =
{ ButtonStr , SdlAttrDataTypeId , SdlIgnore , { ButtonStr , SdlAttrDataTypeId , SdlIgnore ,
SDL_ATTR_BUTTON, SDL_ATTR_BUTTON,
NULL }, 0 },
{ "cells" , SdlAttrDataTypeId , SdlElementSpecific, { "cells" , SdlAttrDataTypeId , SdlElementSpecific,
SDL_ATTR_CELLS, SDL_ATTR_CELLS,
@ -1268,7 +1268,7 @@ static SDLAttribute SDLAttributeList[] =
{ "descript" , SdlAttrDataTypeCdata , SdlIgnore , { "descript" , SdlAttrDataTypeCdata , SdlIgnore ,
SDL_ATTR_DESCRIPT, SDL_ATTR_DESCRIPT,
NULL }, 0 },
{ "doc-id" , SdlAttrDataTypeCdata , SdlElementSpecific, { "doc-id" , SdlAttrDataTypeCdata , SdlElementSpecific,
SDL_ATTR_DOCID , SDL_ATTR_DOCID ,
@ -1294,7 +1294,7 @@ static SDLAttribute SDLAttributeList[] =
{ "hdr" , SdlAttrDataTypeEnum , SdlIgnore , { "hdr" , SdlAttrDataTypeEnum , SdlIgnore ,
SDL_ATTR_HDR , SDL_ATTR_HDR ,
NULL }, 0 },
{ "headw" , SdlAttrDataTypeNumber , SdlContainerSpecific , { "headw" , SdlAttrDataTypeNumber , SdlContainerSpecific ,
SDL_ATTR_HEADWDTH, SDL_ATTR_HEADWDTH,
@ -1317,7 +1317,7 @@ static SDLAttribute SDLAttributeList[] =
SDLAttrOffset(ElementInfoPtr,language) }, SDLAttrOffset(ElementInfoPtr,language) },
{ "length" , SdlAttrDataTypeNumber, SdlIgnore , { "length" , SdlAttrDataTypeNumber, SdlIgnore ,
SDL_ATTR_LENGTH , SDL_ATTR_LENGTH ,
NULL }, 0 },
{ "level" , SdlAttrDataTypeNumber, SdlElementSpecific, { "level" , SdlAttrDataTypeNumber, SdlElementSpecific,
SDL_ATTR_LEVEL , SDL_ATTR_LEVEL ,
@ -1325,10 +1325,10 @@ static SDLAttribute SDLAttributeList[] =
{ "license" , SdlAttrDataTypeCdata , SdlIgnore , { "license" , SdlAttrDataTypeCdata , SdlIgnore ,
SDL_ATTR_LICENSE , SDL_ATTR_LICENSE ,
NULL }, 0 },
{ "linkinfo" , SdlAttrDataTypeCdata , SdlIgnore , { "linkinfo" , SdlAttrDataTypeCdata , SdlIgnore ,
SDL_ATTR_LINKINFO, SDL_ATTR_LINKINFO,
NULL }, 0 },
{ "locs" , SdlAttrDataTypeCdata , SdlElementSpecific, { "locs" , SdlAttrDataTypeCdata , SdlElementSpecific,
SDL_ATTR_LOCS , SDL_ATTR_LOCS ,
@ -1354,10 +1354,10 @@ static SDLAttribute SDLAttributeList[] =
{ "placement" , SdlAttrDataTypeEnum , SdlIgnore , { "placement" , SdlAttrDataTypeEnum , SdlIgnore ,
SDL_ATTR_PLACEMENT, SDL_ATTR_PLACEMENT,
NULL }, 0 },
{ "phrase" , SdlAttrDataTypeCdata , SdlIgnore , { "phrase" , SdlAttrDataTypeCdata , SdlIgnore ,
SDL_ATTR_PHRASE , SDL_ATTR_PHRASE ,
NULL }, 0 },
{ "pointsz" , SdlAttrDataTypeNumber, SdlFontSpecific, { "pointsz" , SdlAttrDataTypeNumber, SdlFontSpecific,
SDL_ATTR_POINTSZ , SDL_ATTR_POINTSZ ,
@ -1365,16 +1365,16 @@ static SDLAttribute SDLAttributeList[] =
{ "pub-id" , SdlAttrDataTypeCdata , SdlIgnore , { "pub-id" , SdlAttrDataTypeCdata , SdlIgnore ,
SDL_ATTR_PUBID , SDL_ATTR_PUBID ,
NULL }, 0 },
{ "prodpn" , SdlAttrDataTypeCdata , SdlIgnore , { "prodpn" , SdlAttrDataTypeCdata , SdlIgnore ,
SDL_ATTR_PRODPN , SDL_ATTR_PRODPN ,
NULL }, 0 },
{ ProductStr , SdlAttrDataTypeCdata , SdlIgnore , { ProductStr , SdlAttrDataTypeCdata , SdlIgnore ,
SDL_ATTR_PRODUCT, SDL_ATTR_PRODUCT,
NULL }, 0 },
{ "prodver" , SdlAttrDataTypeCdata , SdlIgnore , { "prodver" , SdlAttrDataTypeCdata , SdlIgnore ,
SDL_ATTR_PRODVER, SDL_ATTR_PRODVER,
NULL }, 0 },
{ "r-margin" , SdlAttrDataTypeNumber, SdlContainerSpecific , { "r-margin" , SdlAttrDataTypeNumber, SdlContainerSpecific ,
SDL_ATTR_RMARGIN, SDL_ATTR_RMARGIN,
@ -1411,10 +1411,10 @@ static SDLAttribute SDLAttributeList[] =
{ "srcdtd" , SdlAttrDataTypeCdata , SdlIgnore , { "srcdtd" , SdlAttrDataTypeCdata , SdlIgnore ,
SDL_ATTR_SRCDTD , SDL_ATTR_SRCDTD ,
NULL }, 0 },
{ "srch-wt" , SdlAttrDataTypeNumber, SdlIgnore , { "srch-wt" , SdlAttrDataTypeNumber, SdlIgnore ,
SDL_ATTR_SRCHWT , SDL_ATTR_SRCHWT ,
NULL }, 0 },
{ "ssi" , SdlAttrDataTypeCdata , SdlElementSpecific, { "ssi" , SdlAttrDataTypeCdata , SdlElementSpecific,
SDL_ATTR_SSI , SDL_ATTR_SSI ,
@ -1422,7 +1422,7 @@ static SDLAttribute SDLAttributeList[] =
{ "stack" , SdlAttrDataTypeEnum , SdlIgnore , { "stack" , SdlAttrDataTypeEnum , SdlIgnore ,
SDL_ATTR_STACK, SDL_ATTR_STACK,
NULL }, 0 },
{ "style" , SdlAttrDataTypeFont , SdlFontSpecific , { "style" , SdlAttrDataTypeFont , SdlFontSpecific ,
SDL_ATTR_STYLE, SDL_ATTR_STYLE,
@ -1436,7 +1436,7 @@ static SDLAttribute SDLAttributeList[] =
{ (TextStr+1) , SdlAttrDataTypeCdata , SdlIgnore, { (TextStr+1) , SdlAttrDataTypeCdata , SdlIgnore,
SDL_ATTR_TEXT , SDL_ATTR_TEXT ,
NULL }, 0 },
{ "timestmp" , SdlAttrDataTypeCdata , SdlElementSpecific, { "timestmp" , SdlAttrDataTypeCdata , SdlElementSpecific,
SDL_ATTR_TIMESTAMP, SDL_ATTR_TIMESTAMP,
@ -1450,7 +1450,7 @@ static SDLAttribute SDLAttributeList[] =
{ "traversal" , SdlAttrDataTypeEnum , SdlIgnore , { "traversal" , SdlAttrDataTypeEnum , SdlIgnore ,
SDL_ATTR_TRAVERSAL, SDL_ATTR_TRAVERSAL,
NULL }, 0 },
{ "typenam" , SdlAttrDataTypeCdata , SdlFontSpecific , { "typenam" , SdlAttrDataTypeCdata , SdlFontSpecific ,
SDL_ATTR_TYPENAM, SDL_ATTR_TYPENAM,
@ -1467,7 +1467,7 @@ static SDLAttribute SDLAttributeList[] =
{ "version" , SdlAttrDataTypeCdata , SdlIgnore , { "version" , SdlAttrDataTypeCdata , SdlIgnore ,
SDL_ATTR_VERSION, SDL_ATTR_VERSION,
NULL }, 0 },
{(TopVJustStr+4) , SdlAttrDataTypeEnum , SdlContainerSpecific , {(TopVJustStr+4) , SdlAttrDataTypeEnum , SdlContainerSpecific ,
SDL_ATTR_VJUST, SDL_ATTR_VJUST,
@ -1500,7 +1500,7 @@ static SDLAttribute SDLAttributeList[] =
{ "xlfdib" , SdlAttrDataTypeCdata , SdlFontSpecific , { "xlfdib" , SdlAttrDataTypeCdata , SdlFontSpecific ,
SDL_ATTR_XLFDIB , SDL_ATTR_XLFDIB ,
SDLAttrOffset(_DtHelpFontHintPtr,xlfdib) }, SDLAttrOffset(_DtHelpFontHintPtr,xlfdib) },
{ NULL , SdlAttrDataTypeInvalid, -1, NULL }, { 0 , SdlAttrDataTypeInvalid, -1, 0 },
}; };
/****************************************************************************** /******************************************************************************
@ -7039,7 +7039,7 @@ Cdata(
i = 0; i = 0;
string = my_struct->remember; string = my_struct->remember;
myLen = strlen(string); myLen = strlen(string);
while (string[i] != '\0') while (string[i] != '\0' && i < myLen)
{ {
if (multiLen != 1) if (multiLen != 1)
curLen = mblen (&string[i], multiLen); curLen = mblen (&string[i], multiLen);

2
cde/lib/DtHelp/il/ilscale.c
View file

@ -173,7 +173,7 @@ ilBool Lastbit;
if(Lastbit) { if(Lastbit) {
flip_bits((ilPtr)dstLong, sizeof(dstLong)); flip_bits((ilPtr)&dstLong, sizeof(dstLong));
*pdstline++ = dstLong; *pdstline++ = dstLong;
dstLong = 1; dstLong = 1;