Standardize syntax around sizeof(foo) #4875
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
richsalz
added
branch: 1.0.2
dot-asm
reviewed
Dec 8, 2017
| @@ -317,7 +317,7 @@ static int CreateSocketPair (int SocketFamily, | |||
| /* | |||
| ** Initialize the socket information | |||
| */ | |||
| slen = sizeof (sin); | |||
| slen = sizeof(sin); | |||
| memset ((char *) &sin, 0, slen); | |||
There was a problem hiding this comment.
Same comment as in #4876, but three occurrences here...
There was a problem hiding this comment.
If cross-compared to master, it might be more appropriate to dismiss this comment, even in #4876. I mean it's probably more appropriate to address it separately [if at all].
dot-asm
reviewed
Dec 8, 2017
crypto/ec/ec_mult.c
Outdated
| wNAF = OPENSSL_malloc((totalnum + 1) * sizeof wNAF[0]); /* includes space | ||
| wsize = OPENSSL_malloc(totalnum * sizeof(wsize[0])); | ||
| wNAF_len = OPENSSL_malloc(totalnum * sizeof(wNAF_len[0])); | ||
| wNAF = OPENSSL_malloc((totalnum + 1) * sizeof(wNAF[0])); /* includes space | ||
| * for pivot */ |
dot-asm
reviewed
Dec 8, 2017
test/igetest.c
Outdated
| @@ -200,16 +200,16 @@ static int run_test_vectors(void) | |||
| assert(v->length <= MAX_VECTOR_SIZE); | |||
|
|
|||
| if (v->encrypt == AES_ENCRYPT) | |||
| AES_set_encrypt_key(v->key, 8 * sizeof v->key, &key); | |||
| AES_set_encrypt_key(v->key, 8 * sizeof(v)->key, &key); | |||
There was a problem hiding this comment.
This aint right. It's sizeof(v->key), not sizeof(v)->key.
dot-asm
reviewed
Dec 8, 2017
test/igetest.c
Outdated
| else | ||
| AES_set_decrypt_key(v->key, 8 * sizeof v->key, &key); | ||
| memcpy(iv, v->iv, sizeof iv); | ||
| AES_set_decrypt_key(v->key, 8 * sizeof(v)->key, &key); |
|
I don't want to fix anything other than the sizeof uses here. |
|
Also fixed the "jagged comment" in crypto/ec/ec_mult.c |
dot-asm
reviewed
Dec 8, 2017
crypto/bn/exptest.c
Outdated
| @@ -183,7 +183,7 @@ int main(int argc, char *argv[]) | |||
| unsigned char c; | |||
| BIGNUM *r_mont, *r_mont_const, *r_recp, *r_simple, *a, *b, *m; | |||
|
|
|||
| RAND_seed(rnd_seed, sizeof rnd_seed); /* or BN_rand may fail, and we | |||
| RAND_seed(rnd_seed, sizeof(rnd_seed)); /* or BN_rand may fail, and we | |||
| * don't even check its return | |||
| * value (which we should) */ | |||
There was a problem hiding this comment.
Another jagged comment... Even in #4876...
dot-asm
reviewed
Dec 8, 2017
| @@ -252,15 +252,15 @@ int OpenSocket(int nPort) | |||
| } | |||
|
|
|||
| if (setsockopt | |||
| (nSocket, SOL_SOCKET, SO_REUSEADDR, (char *)&one, sizeof one) < 0) { | |||
| (nSocket, SOL_SOCKET, SO_REUSEADDR, (char *)&one, sizeof(one)) < 0) { | |||
There was a problem hiding this comment.
That's an incompliant formatting! Side note!
Reformat comment.
|
Added commit to fix the exptest comment-wrapping issue. |
dot-asm
approved these changes
Dec 8, 2017
dot-asm
added
approval: done
levitte
pushed a commit
that referenced
this pull request
Dec 8, 2017
Reviewed-by: Andy Polyakov <appro@openssl.org> (Merged from #4875)
|
Thanks for the feedback; merged to 1.0.2 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is the #4872 done for 1.0.2