skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Remove __unused since it's non-standard.

Browse Source 
1. It breaks compilers without support for __attribute__
2. It breaks system headers that declare variables named __unused (eg. musl libc).
This commit is contained in:
Maarten Billemont
2018-06-05 21:22:40 -04:00
parent c7425be681
commit c3017069b1
5 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
platform-independent/c/cli/src/blowfish.h
View File

@@ -494,7 +494,7 @@ Blowfish_expandstate(blf_ctx *c, const uint8_t *data, uint16_t databytes,
}
void
__unused blf_key(blf_ctx *c, const uint8_t *k, uint16_t len)
blf_key(blf_ctx *c, const uint8_t *k, uint16_t len)
{
/* Initialize S-boxes and subkeys with Pi */
Blowfish_initstate(c);
@@ -517,7 +517,7 @@ blf_enc(blf_ctx *c, uint32_t *data, uint16_t blocks)
}
void
__unused blf_dec(blf_ctx *c, uint32_t *data, uint16_t blocks)
blf_dec(blf_ctx *c, uint32_t *data, uint16_t blocks)
{
uint32_t *d;
uint16_t i;
@@ -530,7 +530,7 @@ __unused blf_dec(blf_ctx *c, uint32_t *data, uint16_t blocks)
}
void
__unused blf_ecb_encrypt(blf_ctx *c, uint8_t *data, uint32_t len)
blf_ecb_encrypt(blf_ctx *c, uint8_t *data, uint32_t len)
{
uint32_t l, r;
uint32_t i;
@@ -552,7 +552,7 @@ __unused blf_ecb_encrypt(blf_ctx *c, uint8_t *data, uint32_t len)
}
void
__unused blf_ecb_decrypt(blf_ctx *c, uint8_t *data, uint32_t len)
blf_ecb_decrypt(blf_ctx *c, uint8_t *data, uint32_t len)
{
uint32_t l, r;
uint32_t i;
@@ -574,7 +574,7 @@ __unused blf_ecb_decrypt(blf_ctx *c, uint8_t *data, uint32_t len)
}
void
__unused blf_cbc_encrypt(blf_ctx *c, uint8_t *iv, uint8_t *data, uint32_t len)
blf_cbc_encrypt(blf_ctx *c, uint8_t *iv, uint8_t *data, uint32_t len)
{
uint32_t l, r;
uint32_t i, j;
@@ -599,7 +599,7 @@ __unused blf_cbc_encrypt(blf_ctx *c, uint8_t *iv, uint8_t *data, uint32_t len)
}
void
__unused blf_cbc_decrypt(blf_ctx *c, uint8_t *iva, uint8_t *data, uint32_t len)
blf_cbc_decrypt(blf_ctx *c, uint8_t *iva, uint8_t *data, uint32_t len)
{
uint32_t l, r;
uint8_t *iv;

8
platform-independent/c/cli/src/mpw-cli.c
View File

@@ -530,7 +530,7 @@ void cli_user(Arguments *args, Operation *operation) {
operation->fullName, operation->masterPassword, MPAlgorithmVersionCurrent );
}
void cli_site(Arguments __unused *args, Operation *operation) {
void cli_site(Arguments *args, Operation *operation) {
if (!operation->siteName)
abort();
@@ -546,7 +546,7 @@ void cli_site(Arguments __unused *args, Operation *operation) {
operation->user, operation->siteName, operation->user->defaultType, MPCounterValueDefault, operation->user->algorithm );
}
void cli_question(Arguments __unused *args, Operation *operation) {
void cli_question(Arguments *args, Operation *operation) {
if (!operation->site)
abort();
@@ -569,7 +569,7 @@ void cli_question(Arguments __unused *args, Operation *operation) {
}
}
void cli_operation(Arguments __unused *args, Operation *operation) {
void cli_operation(Arguments *args, Operation *operation) {
mpw_free_string( &operation->identicon );
operation->identicon = mpw_identicon_str( mpw_identicon( operation->user->fullName, operation->user->masterPassword ) );
@@ -770,7 +770,7 @@ void cli_mpw(Arguments *args, Operation *operation) {
operation->site->uses++;
}
void cli_save(Arguments __unused *args, Operation *operation) {
void cli_save(Arguments *args, Operation *operation) {
if (operation->sitesFormat == MPMarshalFormatNone)
return;