Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #1396, do not use intmax_t/uintmax_t types #1397

Merged
merged 1 commit into from
Jul 27, 2023

Conversation

jphickey
Copy link
Contributor

Checklist (Please check before submitting)

Describe the contribution
Replace these with long and unsigned long, respectively, as some old systems might not have these types even if it does provide stdint.h

Fixes #1396

Testing performed
Build on vxworks 6.9 (gcc 4.3.3)

Expected behavior changes
Build should succeed

System(s) tested on
GSFC VxWorks build host

Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.

Replace these with long and unsigned long, respectively, as some old systems
might not have these types even if it does provide stdint.h
@@ -417,7 +417,7 @@
return TempBuf;
}

static bool UtAssert_DoCompare(intmax_t ActualValueIn, UtAssert_Compare_t CompareType, UT_IntCheck_t ReferenceValueIn,
static bool UtAssert_DoCompare(long ActualValueIn, UtAssert_Compare_t CompareType, UT_IntCheck_t ReferenceValueIn,

Check notice

Code scanning / CodeQL

Long function without assertion Note

All functions of more than 10 lines should have at least one assertion.
@@ -417,7 +417,7 @@
return TempBuf;
}

static bool UtAssert_DoCompare(intmax_t ActualValueIn, UtAssert_Compare_t CompareType, UT_IntCheck_t ReferenceValueIn,
static bool UtAssert_DoCompare(long ActualValueIn, UtAssert_Compare_t CompareType, UT_IntCheck_t ReferenceValueIn,

Check notice

Code scanning / CodeQL

Function too long Note

UtAssert_DoCompare has too many lines (75, while 60 are allowed).
@jphickey jphickey added the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label Jul 26, 2023
@dzbaker dzbaker added CCB:Approved Indicates code review and approval by community CCB and removed CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) labels Jul 27, 2023
dzbaker added a commit to nasa/cFS that referenced this pull request Jul 27, 2023
*Combines:*

cFE v7.0.0-rc4+dev356
osal v6.0.0-rc4+dev223

**Includes:**

*cFE*
- nasa/cFE#2416

*osal*
- nasa/osal#1397
- nasa/osal#1399

Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com>
@dzbaker dzbaker mentioned this pull request Jul 27, 2023
2 tasks
@dzbaker dzbaker merged commit f53c7c4 into nasa:main Jul 27, 2023
19 checks passed
dzbaker added a commit to nasa/cFS that referenced this pull request Jul 27, 2023
*Combines:*

cFE v7.0.0-rc4+dev356
osal v6.0.0-rc4+dev223

**Includes:**

*cFE*
- nasa/cFE#2416

*osal*
- nasa/osal#1397
- nasa/osal#1399

Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com>
@dmknutsen dmknutsen added this to the Equuleus milestone Sep 1, 2023
@jphickey jphickey deleted the fix-1396-no-intmax branch November 16, 2023 14:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CCB:Approved Indicates code review and approval by community CCB Equuleus-rc1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Some systems do not provide an "intmax_t" via stdint.h
3 participants