From cb6240bc751f78abfcc24de2339bc49b6aeefa87 Mon Sep 17 00:00:00 2001 From: Calvin Buckley Date: Sun, 17 Oct 2021 23:36:56 -0300 Subject: Fix a long long that crept past --- src/commit_graph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/commit_graph.c b/src/commit_graph.c index f9a4bd2b2..397bee5e2 100644 --- a/src/commit_graph.c +++ b/src/commit_graph.c @@ -1075,7 +1075,7 @@ static int commit_graph_write( commit_time = (uint64_t)packed_commit->commit_time; if (generation > GIT_COMMIT_GRAPH_GENERATION_NUMBER_MAX) generation = GIT_COMMIT_GRAPH_GENERATION_NUMBER_MAX; - word = ntohl((uint32_t)((generation << 2) | ((commit_time >> 32ull) & 0x3ull))); + word = ntohl((uint32_t)((generation << 2) | ((commit_time >> UINT64_C(32)) & UINT64_C(0x3)))); error = git_str_put(&commit_data, (const char *)&word, sizeof(word)); if (error < 0) goto cleanup; -- cgit v1.2.1 From b029713ae13bfc9edd08d4d7f9570d7b8e0bb0ec Mon Sep 17 00:00:00 2001 From: Calvin Buckley Date: Mon, 18 Oct 2021 23:30:49 -0300 Subject: Also correct this long long constant I missed this because I searched for digits before ULL, otherwise it would match terms like "null" or "fully". --- src/commit_graph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/commit_graph.c b/src/commit_graph.c index 397bee5e2..82b3901b3 100644 --- a/src/commit_graph.c +++ b/src/commit_graph.c @@ -1079,7 +1079,7 @@ static int commit_graph_write( error = git_str_put(&commit_data, (const char *)&word, sizeof(word)); if (error < 0) goto cleanup; - word = ntohl((uint32_t)(commit_time & 0xffffffffull)); + word = ntohl((uint32_t)(commit_time & UINT64_C(0xffffffff))); error = git_str_put(&commit_data, (const char *)&word, sizeof(word)); if (error < 0) goto cleanup; -- cgit v1.2.1 From 017f38f17cc51ab1e949a14713da6ab2ec66648b Mon Sep 17 00:00:00 2001 From: Calvin Buckley Date: Mon, 18 Oct 2021 23:32:47 -0300 Subject: Fix long long constants in macro in ntlmclient This should be propagated to upstream. --- deps/ntlmclient/ntlm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/deps/ntlmclient/ntlm.c b/deps/ntlmclient/ntlm.c index 3393be915..ad4de5de5 100644 --- a/deps/ntlmclient/ntlm.c +++ b/deps/ntlmclient/ntlm.c @@ -930,10 +930,10 @@ const char *ntlm_client_target_domain_dns(ntlm_client *ntlm) } #define EVEN_PARITY(a) \ - (!!((a) & 0x01ll) ^ !!((a) & 0x02ll) ^ \ - !!((a) & 0x04ll) ^ !!((a) & 0x08ll) ^ \ - !!((a) & 0x10ll) ^ !!((a) & 0x20ll) ^ \ - !!((a) & 0x40ll) ^ !!((a) & 0x80ll)) + (!!((a) & INT64_C(0x01)) ^ !!((a) & INT64_C(0x02)) ^ \ + !!((a) & INT64_C(0x04)) ^ !!((a) & INT64_C(0x08)) ^ \ + !!((a) & INT64_C(0x10)) ^ !!((a) & INT64_C(0x20)) ^ \ + !!((a) & INT64_C(0x40)) ^ !!((a) & INT64_C(0x80))) static void generate_odd_parity(ntlm_des_block *block) { -- cgit v1.2.1 From 5761980d11c739be3b360b5fb0d45552d8495291 Mon Sep 17 00:00:00 2001 From: Calvin Buckley Date: Sat, 11 Dec 2021 22:33:16 -0400 Subject: Simplifications to definitions to avoid UINT64_C --- src/commit_graph.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/commit_graph.c b/src/commit_graph.c index 82b3901b3..3709fa341 100644 --- a/src/commit_graph.c +++ b/src/commit_graph.c @@ -1075,11 +1075,11 @@ static int commit_graph_write( commit_time = (uint64_t)packed_commit->commit_time; if (generation > GIT_COMMIT_GRAPH_GENERATION_NUMBER_MAX) generation = GIT_COMMIT_GRAPH_GENERATION_NUMBER_MAX; - word = ntohl((uint32_t)((generation << 2) | ((commit_time >> UINT64_C(32)) & UINT64_C(0x3)))); + word = ntohl((uint32_t)((generation << 2) | (((uint32_t)(commit_time >> 32)) & 0x3) )); error = git_str_put(&commit_data, (const char *)&word, sizeof(word)); if (error < 0) goto cleanup; - word = ntohl((uint32_t)(commit_time & UINT64_C(0xffffffff))); + word = ntohl((uint32_t)(commit_time & 0xfffffffful)); error = git_str_put(&commit_data, (const char *)&word, sizeof(word)); if (error < 0) goto cleanup; -- cgit v1.2.1