Skip to content

Commit 2cc1403

Browse files
committed
Changed iterator internal logic to use a one-based index instead of 0; an
index of 0 can be considered NULL.
1 parent 19e8796 commit 2cc1403

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/messageobj.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ TidyMessageArgument TY_(getNextMessageArgument)( TidyMessageImpl message, TidyIt
392392

393393
if ( itemIndex >= 1 && itemIndex <= (size_t)message.argcount )
394394
{
395-
item = itemIndex - 1;
395+
item = itemIndex;
396396
itemIndex++;
397397
}
398398

@@ -407,7 +407,7 @@ TidyMessageArgument TY_(getNextMessageArgument)( TidyMessageImpl message, TidyIt
407407

408408
TidyFormatParameterType TY_(getArgType)( TidyMessageImpl message, TidyMessageArgument* arg )
409409
{
410-
int argNum = (int)(size_t)*arg;
410+
int argNum = (int)(size_t)*arg - 1;
411411
assert( argNum <= message.argcount );
412412

413413
return message.arguments[argNum].type;
@@ -416,7 +416,7 @@ TidyFormatParameterType TY_(getArgType)( TidyMessageImpl message, TidyMessageArg
416416

417417
ctmbstr TY_(getArgFormat)( TidyMessageImpl message, TidyMessageArgument* arg )
418418
{
419-
int argNum = (int)(size_t)*arg;
419+
int argNum = (int)(size_t)*arg - 1;
420420
assert( argNum <= message.argcount );
421421

422422
return message.arguments[argNum].format;
@@ -425,7 +425,7 @@ ctmbstr TY_(getArgFormat)( TidyMessageImpl message, TidyMessageArgument* arg )
425425

426426
ctmbstr TY_(getArgValueString)( TidyMessageImpl message, TidyMessageArgument* arg )
427427
{
428-
int argNum = (int)(size_t)*arg;
428+
int argNum = (int)(size_t)*arg - 1;
429429
assert( argNum <= message.argcount );
430430
assert( message.arguments[argNum].type == tidyFormatType_STRING);
431431

@@ -435,7 +435,7 @@ ctmbstr TY_(getArgValueString)( TidyMessageImpl message, TidyMessageArgument* ar
435435

436436
uint TY_(getArgValueUInt)( TidyMessageImpl message, TidyMessageArgument* arg )
437437
{
438-
int argNum = (int)(size_t)*arg;
438+
int argNum = (int)(size_t)*arg - 1;
439439
assert( argNum <= message.argcount );
440440
assert( message.arguments[argNum].type == tidyFormatType_UINT);
441441

@@ -445,7 +445,7 @@ uint TY_(getArgValueUInt)( TidyMessageImpl message, TidyMessageArgument* arg )
445445

446446
int TY_(getArgValueInt)( TidyMessageImpl message, TidyMessageArgument* arg )
447447
{
448-
int argNum = (int)(size_t)*arg;
448+
int argNum = (int)(size_t)*arg - 1;
449449
assert( argNum <= message.argcount );
450450
assert( message.arguments[argNum].type == tidyFormatType_INT);
451451

@@ -455,7 +455,7 @@ int TY_(getArgValueInt)( TidyMessageImpl message, TidyMessageArgument* arg )
455455

456456
double TY_(getArgValueDouble)( TidyMessageImpl message, TidyMessageArgument* arg )
457457
{
458-
int argNum = (int)(size_t)*arg;
458+
int argNum = (int)(size_t)*arg - 1;
459459
assert( argNum <= message.argcount );
460460
assert( message.arguments[argNum].type == tidyFormatType_DOUBLE);
461461

0 commit comments

Comments
 (0)