Avoiding conditional directives that split up parts of statements. #1480
Conversation
|
@marciomribeiro can you indent the #ifdefs as well? |
|
I've attached 2 files. Do you prefer Option1 or Option2? Option 1: Option 2: |
|
I like option 2 |
|
Don't know why the CI build has failed. I didn't change anything but the indentation... |
|
that's normal, the tests are broken On Tue, Mar 8, 2016 at 11:24 AM, Márcio Ribeiro [email protected]
|
|
Is the pull request now ready to be accepted?! |
|
once I or someone else can review it yeah! thanks! |
|
@marciomribeiro you may want to reopen this on https://github.com/TokTok/toxcore |
|
Is this going to be merged or continued? |
| @@ -239,12 +239,12 @@ escrypt_kdf_nosse(escrypt_local_t * local, | |||
| uint32_t i; | |||
|
|
|||
| /* Sanity-check parameters. */ | |||
| #if SIZE_MAX > UINT32_MAX | |||
| #if SIZE_MAX > UINT32_MAX | |||
There was a problem hiding this comment.
@marciomribeiro please undo this formatting change.
| if (buflen > (((uint64_t)(1) << 32) - 1) * 32) { | ||
| errno = EFBIG; | ||
| return -1; | ||
| } | ||
| #endif | ||
| #endif |
| #endif | ||
| (N > SIZE_MAX / 128 / r)) { | ||
| int test = (r > SIZE_MAX / 128 / p) || (N > SIZE_MAX / 128 / r); | ||
| #if SIZE_MAX / 256 <= UINT32_MAX |
| (r > SIZE_MAX / 256) || | ||
| #endif | ||
| (N > SIZE_MAX / 128 / r)) { | ||
| int test = (r > SIZE_MAX / 128 / p) || (N > SIZE_MAX / 128 / r); |
There was a problem hiding this comment.
Use _Bool. Also rename to something more useful. test doesn't say anything. What is it testing?
| int test = (r > SIZE_MAX / 128 / p) || (N > SIZE_MAX / 128 / r); | ||
| #if SIZE_MAX / 256 <= UINT32_MAX | ||
| test = test || (r > SIZE_MAX / 256); | ||
| #endif |
| MAP_ANON | MAP_PRIVATE, | ||
| #endif | ||
| -1, 0)) == MAP_FAILED) | ||
| #ifdef MAP_ANON |
There was a problem hiding this comment.
Move all of these back to column 0.
| uint32_t i; | ||
|
|
||
| /* Sanity-check parameters. */ | ||
| #if SIZE_MAX > UINT32_MAX | ||
| #if SIZE_MAX > UINT32_MAX |
There was a problem hiding this comment.
Same thing in this file: revert the style change.
|
Done. |
A suggestion to compile entire statements and expressions, as suggested by code style guidelines from the Linux Kernel and practitioners.
It might improve code understanding, maintainability and error-proneness.