From 4c9abedff3541138fa5331e93db2a2f518c0555b Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Thu, 25 Jul 2024 23:02:50 -0400 Subject: [PATCH] Fixes incompatible pointer types error * ACSInfo struct member 'subarray' is an int, not Bool. Use GetKeyInt() in place of GetKeyBool() * upperCase() function argument expects type (char *), not (char **) --- pkg/acs/lib/getacskeys.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/acs/lib/getacskeys.c b/pkg/acs/lib/getacskeys.c index 70510d9fe..6520ad28d 100644 --- a/pkg/acs/lib/getacskeys.c +++ b/pkg/acs/lib/getacskeys.c @@ -77,7 +77,7 @@ int getACSKeys (ACSInfo *acs, Hdr *phdr) { if (GetKeyInt (phdr, "NEXTEND", USE_DEFAULT, EXT_PER_GROUP, &acs->nextend)) return (status); - if (GetKeyBool (phdr, "SUBARRAY", NO_DEFAULT, 0, &acs->subarray)) + if (GetKeyInt (phdr, "SUBARRAY", NO_DEFAULT, 0, &acs->subarray)) return (status); /* Get CCD-specific parameters. */ @@ -145,9 +145,9 @@ int checkACSKeys(ACSInfo *acs) return INVALID_EXPTIME; } - upperCase(&acs->aperture); - upperCase(&acs->jwrotype); - upperCase(&acs->flashstatus); + upperCase(acs->aperture); + upperCase(acs->jwrotype); + upperCase(acs->flashstatus); // Convert number of extensions to number of SingleGroups. // NOTE: this is technically incorrect and instead findTotalNumberOfImsets() @@ -163,7 +163,7 @@ int checkACSKeys(ACSInfo *acs) /* Get CCD-specific parameters. */ if (acs->detector != MAMA_DETECTOR) { - upperCase(&acs->ccdamp); + upperCase(acs->ccdamp); /* Verify that only the letters 'ABCD' are in the string. */ const char * ampAlphabet = "ABCD"; if (!isStrInLanguage(acs->ccdamp, ampAlphabet))