The_Great_Archive/OpenPGP-SDK
1
0
Fork 0
mirror of https://github.com/RetroShare/OpenPGP-SDK.git synced 2026-09-12 19:50:03 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4 from nicoroeser/fix-c23-varname-keyword-clash

Browse Source 
Fix variable name collision with C23 keyword ‘bool’
This commit is contained in:
csoler 2025-05-12 09:43:58 +02:00 committed by GitHub
commit 178aa8ebce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/openpgpsdk/packet-parse.c
View File

@ -1512,7 +1512,7 @@ static int parse_one_signature_subpacket(ops_signature_t *sig,
ops_parser_content_t content;
unsigned t8,t7;
ops_boolean_t read=ops_true;
unsigned char bool[1]="";
unsigned char bool_[1]="";
ops_init_subregion(&subregion,region);
if(!limited_read_new_length(&subregion.length,region,pinfo))
@ -1569,9 +1569,9 @@ static int parse_one_signature_subpacket(ops_signature_t *sig,
break;
case OPS_PTAG_SS_REVOCABLE:
if(!limited_read(bool,1,&subregion,pinfo))
if(!limited_read(bool_,1,&subregion,pinfo))
return 0;
C.ss_revocable.revocable=!!bool[0];
C.ss_revocable.revocable=!!bool_[0];
break;
case OPS_PTAG_SS_ISSUER_KEY_ID:
@ -1598,9 +1598,9 @@ static int parse_one_signature_subpacket(ops_signature_t *sig,
break;
case OPS_PTAG_SS_PRIMARY_USER_ID:
if(!limited_read (bool,1,&subregion,pinfo))
if(!limited_read (bool_,1,&subregion,pinfo))
return 0;
C.ss_primary_user_id.primary_user_id = !!bool[0];
C.ss_primary_user_id.primary_user_id = !!bool_[0];
break;
case OPS_PTAG_SS_KEY_FLAGS:

4
src/openpgpsdk/packet-print.c
View File

@ -475,11 +475,11 @@ static void print_duration(char *name, time_t time)
printf("\n");
}
static void print_boolean(const char *name, unsigned char bool)
static void print_boolean(const char *name, unsigned char bool_)
{
print_name(name);
if(bool)
if(bool_)
printf("Yes");
else
printf("No");