Skip to content

Commit

Permalink
Rename internal variable
Browse files Browse the repository at this point in the history
  • Loading branch information
Ubuntu committed Feb 27, 2024
1 parent a34bbb2 commit c787ba7
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 43 deletions.
12 changes: 6 additions & 6 deletions source/include/sigv4_internal.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,12 +155,12 @@
*/
typedef struct SigV4DateTime
{
int32_t datetimeYear; /**< Year (1900 or later) */
int32_t datetimeMon; /**< Month (1 to 12) */
int32_t datetimeMday; /**< Day of Month (1 to 28/29/30/31) */
int32_t datetimeHour; /**< Hour (0 to 23) */
int32_t datetimeMin; /**< Minutes (0 to 59) */
int32_t datetimeSec; /**< Seconds (0 to 60) */
int32_t year; /**< Year (1900 or later) */
int32_t mon; /**< Month (1 to 12) */
int32_t mday; /**< Day of Month (1 to 28/29/30/31) */
int32_t hour; /**< Hour (0 to 23) */
int32_t min; /**< Minutes (0 to 59) */
int32_t sec; /**< Seconds (0 to 60) */
} SigV4DateTime_t;

/**
Expand Down
62 changes: 31 additions & 31 deletions source/sigv4.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -751,14 +751,14 @@ static SigV4Status_t checkLeap( const SigV4DateTime_t * pDateElements )
assert( pDateElements != NULL );

/* If the date represents a leap day, verify that the leap year is valid. */
if( ( pDateElements->datetimeMon == 2 ) && ( pDateElements->datetimeMday == 29 ) )
if( ( pDateElements->mon == 2 ) && ( pDateElements->mday == 29 ) )
{
if( ( ( pDateElements->datetimeYear % 400 ) != 0 ) &&
( ( ( pDateElements->datetimeYear % 4 ) != 0 ) ||
( ( pDateElements->datetimeYear % 100 ) == 0 ) ) )
if( ( ( pDateElements->year % 400 ) != 0 ) &&
( ( ( pDateElements->year % 4 ) != 0 ) ||
( ( pDateElements->year % 100 ) == 0 ) ) )
{
LogError( ( "%ld is not a valid leap year.",
( long int ) pDateElements->datetimeYear ) );
( long int ) pDateElements->year ) );
}
else
{
Expand All @@ -778,27 +778,27 @@ static SigV4Status_t validateDateTime( const SigV4DateTime_t * pDateElements )

assert( pDateElements != NULL );

if( pDateElements->datetimeYear < YEAR_MIN )
if( pDateElements->year < YEAR_MIN )
{
LogError( ( "Invalid 'year' value parsed from date string. "
"Expected an integer %ld or greater, received: %ld",
( long int ) YEAR_MIN,
( long int ) pDateElements->datetimeYear ) );
( long int ) pDateElements->year ) );
returnStatus = SigV4ISOFormattingError;
}

if( ( pDateElements->datetimeMon < 1 ) || ( pDateElements->datetimeMon > 12 ) )
if( ( pDateElements->mon < 1 ) || ( pDateElements->mon > 12 ) )
{
LogError( ( "Invalid 'month' value parsed from date string. "
"Expected an integer between 1 and 12, received: %ld",
( long int ) pDateElements->datetimeMon ) );
( long int ) pDateElements->mon ) );
returnStatus = SigV4ISOFormattingError;
}

/* Ensure that the day of the month is valid for the relevant month. */
if( ( returnStatus != SigV4ISOFormattingError ) &&
( ( pDateElements->datetimeMday < 1 ) ||
( pDateElements->datetimeMday > daysPerMonth[ pDateElements->datetimeMon - 1 ] ) ) )
( ( pDateElements->mday < 1 ) ||
( pDateElements->mday > daysPerMonth[ pDateElements->mon - 1 ] ) ) )
{
/* Check if the date is a valid leap year day. */
returnStatus = checkLeap( pDateElements );
Expand All @@ -807,37 +807,37 @@ static SigV4Status_t validateDateTime( const SigV4DateTime_t * pDateElements )
{
LogError( ( "Invalid 'day' value parsed from date string. "
"Expected an integer between 1 and %ld, received: %ld",
( long int ) daysPerMonth[ pDateElements->datetimeMon - 1 ],
( long int ) pDateElements->datetimeMday ) );
( long int ) daysPerMonth[ pDateElements->mon - 1 ],
( long int ) pDateElements->mday ) );
}
}

/* SigV4DateTime_t values are asserted to be non-negative before they are
* assigned in function addToDate(). Therefore, we only verify logical upper
* bounds for the following values. */
if( pDateElements->datetimeHour > 23 )
if( pDateElements->hour > 23 )
{
LogError( ( "Invalid 'hour' value parsed from date string. "
"Expected an integer between 0 and 23, received: %ld",
( long int ) pDateElements->datetimeHour ) );
( long int ) pDateElements->hour ) );
returnStatus = SigV4ISOFormattingError;
}

if( pDateElements->datetimeMin > 59 )
if( pDateElements->min > 59 )
{
LogError( ( "Invalid 'minute' value parsed from date string. "
"Expected an integer between 0 and 59, received: %ld",
( long int ) pDateElements->datetimeMin ) );
( long int ) pDateElements->min ) );
returnStatus = SigV4ISOFormattingError;
}

/* An upper limit of 60 accounts for the occasional leap second UTC
* adjustment. */
if( pDateElements->datetimeSec > 60 )
if( pDateElements->sec > 60 )
{
LogError( ( "Invalid 'second' value parsed from date string. "
"Expected an integer between 0 and 60, received: %ld",
( long int ) pDateElements->datetimeSec ) );
( long int ) pDateElements->sec ) );
returnStatus = SigV4ISOFormattingError;
}

Expand All @@ -856,27 +856,27 @@ static void addToDate( const char formatChar,
switch( formatChar )
{
case 'Y':
pDateElements->datetimeYear = result;
pDateElements->year = result;
break;

case 'M':
pDateElements->datetimeMon = result;
pDateElements->mon = result;
break;

case 'D':
pDateElements->datetimeMday = result;
pDateElements->mday = result;
break;

case 'h':
pDateElements->datetimeHour = result;
pDateElements->hour = result;
break;

case 'm':
pDateElements->datetimeMin = result;
pDateElements->min = result;
break;

case 's':
pDateElements->datetimeSec = result;
pDateElements->sec = result;
break;

default:
Expand Down Expand Up @@ -3196,14 +3196,14 @@ SigV4Status_t SigV4_AwsIotDateToIso8601( const char * pDate,
{
/* Combine date elements into complete ASCII representation, and fill
* buffer with result. */
intToAscii( date.datetimeYear, &pWriteLoc, ISO_YEAR_LEN );
intToAscii( date.datetimeMon, &pWriteLoc, ISO_NON_YEAR_LEN );
intToAscii( date.datetimeMday, &pWriteLoc, ISO_NON_YEAR_LEN );
intToAscii( date.year, &pWriteLoc, ISO_YEAR_LEN );
intToAscii( date.mon, &pWriteLoc, ISO_NON_YEAR_LEN );
intToAscii( date.mday, &pWriteLoc, ISO_NON_YEAR_LEN );
*pWriteLoc = 'T';
pWriteLoc++;
intToAscii( date.datetimeHour, &pWriteLoc, ISO_NON_YEAR_LEN );
intToAscii( date.datetimeMin, &pWriteLoc, ISO_NON_YEAR_LEN );
intToAscii( date.datetimeSec, &pWriteLoc, ISO_NON_YEAR_LEN );
intToAscii( date.hour, &pWriteLoc, ISO_NON_YEAR_LEN );
intToAscii( date.min, &pWriteLoc, ISO_NON_YEAR_LEN );
intToAscii( date.sec, &pWriteLoc, ISO_NON_YEAR_LEN );
*pWriteLoc = 'Z';

LogDebug( ( "Successfully formatted ISO 8601 date: \"%.*s\"",
Expand Down
12 changes: 6 additions & 6 deletions test/cbmc/stubs/sigv4_stubs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,27 +99,27 @@ void addToDate( const char formatChar,
switch( formatChar )
{
case 'Y':
pDateElements->datetimeYear = result;
pDateElements->year = result;
break;

case 'M':
pDateElements->datetimeMon = result;
pDateElements->mon = result;
break;

case 'D':
pDateElements->datetimeMday = result;
pDateElements->mday = result;
break;

case 'h':
pDateElements->datetimeHour = result;
pDateElements->hour = result;
break;

case 'm':
pDateElements->datetimeMin = result;
pDateElements->min = result;
break;

case 's':
pDateElements->datetimeSec = result;
pDateElements->sec = result;
break;

default:
Expand Down

0 comments on commit c787ba7

Please sign in to comment.