From ed0c6c5757d1d3e86a6f1c4571944a434686f330 Mon Sep 17 00:00:00 2001 From: Miguel Terron Date: Mon, 12 May 2025 10:11:50 +1200 Subject: [PATCH] Run formatter as per the Style Guide in CONTRIBUTING.md --- tool/net/lfuncs.c | 93 +++++++++++++++++++++++++--------------------- tool/net/lrsa.c | 16 ++++---- tool/net/redbean.c | 8 ++-- 3 files changed, 63 insertions(+), 54 deletions(-) diff --git a/tool/net/lfuncs.c b/tool/net/lfuncs.c index 01b3ce19a..e95bc6d90 100644 --- a/tool/net/lfuncs.c +++ b/tool/net/lfuncs.c @@ -859,67 +859,76 @@ int LuaUuidV4(lua_State *L) { } int LuaUuidV7(lua_State *L) { - //See https://www.rfc-editor.org/rfc/rfc9562.html + // See https://www.rfc-editor.org/rfc/rfc9562.html char bin[16], uuid_str[37]; struct timespec ts = timespec_real(); uint64_t unix_ts_ms = (uint64_t)((ts.tv_sec * 1000) + (ts.tv_nsec / 1000000)); - int fractional_ms = (int)floor((double)((double)(ts.tv_nsec - (ts.tv_nsec / 1000000) * 1000000)/1000000) * 4096) <<4; + int fractional_ms = + (int)floor( + (double)((double)(ts.tv_nsec - (ts.tv_nsec / 1000000) * 1000000) / + 1000000) * + 4096) + << 4; uint64_t rand_b = _rand64(); - int rand_a = fractional_ms | (rand_b & 0x000000000000000f); //use the last 4 bits of rand_b + int rand_a = fractional_ms | + (rand_b & 0x000000000000000f); // use the last 4 bits of rand_b - bin[0] = unix_ts_ms >> 050; - bin[1] = unix_ts_ms >> 040; - bin[2] = unix_ts_ms >> 030; - bin[3] = unix_ts_ms >> 020; - bin[4] = unix_ts_ms >> 010; - bin[5] = unix_ts_ms >> 000; - bin[6] = rand_a >> 010; - bin[7] = rand_a >> 000; - bin[8] = rand_b >> 070; - bin[9] = rand_b >> 060; - bin[10] = rand_b >> 050; - bin[11] = rand_b >> 040; - bin[12] = rand_b >> 030; - bin[13] = rand_b >> 020; - bin[14] = rand_b >> 010; - bin[15] = rand_b >> 000; + bin[0] = unix_ts_ms >> 050; + bin[1] = unix_ts_ms >> 040; + bin[2] = unix_ts_ms >> 030; + bin[3] = unix_ts_ms >> 020; + bin[4] = unix_ts_ms >> 010; + bin[5] = unix_ts_ms >> 000; + bin[6] = rand_a >> 010; + bin[7] = rand_a >> 000; + bin[8] = rand_b >> 070; + bin[9] = rand_b >> 060; + bin[10] = rand_b >> 050; + bin[11] = rand_b >> 040; + bin[12] = rand_b >> 030; + bin[13] = rand_b >> 020; + bin[14] = rand_b >> 010; + bin[15] = rand_b >> 000; - uuid_str[0] = "0123456789abcdef"[(bin[0] & 0xf0) >>4]; - uuid_str[1] = "0123456789abcdef"[(bin[0] & 0x0f)]; - uuid_str[2] = "0123456789abcdef"[(bin[1] & 0xf0) >>4]; - uuid_str[3] = "0123456789abcdef"[(bin[1] & 0x0f)]; - uuid_str[4] = "0123456789abcdef"[(bin[2] & 0xf0) >>4]; - uuid_str[5] = "0123456789abcdef"[(bin[2] & 0x0f)]; - uuid_str[6] = "0123456789abcdef"[(bin[3] & 0xf0) >>4]; - uuid_str[7] = "0123456789abcdef"[(bin[3] & 0x0f)]; - uuid_str[8] = '-'; - uuid_str[9] = "0123456789abcdef"[(bin[4] & 0xf0) >>4]; + uuid_str[0] = "0123456789abcdef"[(bin[0] & 0xf0) >> 4]; + uuid_str[1] = "0123456789abcdef"[(bin[0] & 0x0f)]; + uuid_str[2] = "0123456789abcdef"[(bin[1] & 0xf0) >> 4]; + uuid_str[3] = "0123456789abcdef"[(bin[1] & 0x0f)]; + uuid_str[4] = "0123456789abcdef"[(bin[2] & 0xf0) >> 4]; + uuid_str[5] = "0123456789abcdef"[(bin[2] & 0x0f)]; + uuid_str[6] = "0123456789abcdef"[(bin[3] & 0xf0) >> 4]; + uuid_str[7] = "0123456789abcdef"[(bin[3] & 0x0f)]; + uuid_str[8] = '-'; + uuid_str[9] = "0123456789abcdef"[(bin[4] & 0xf0) >> 4]; uuid_str[10] = "0123456789abcdef"[(bin[4] & 0x0f)]; - uuid_str[11] = "0123456789abcdef"[(bin[5] & 0xf0) >>4]; + uuid_str[11] = "0123456789abcdef"[(bin[5] & 0xf0) >> 4]; uuid_str[12] = "0123456789abcdef"[(bin[5] & 0x0f)]; uuid_str[13] = '-'; uuid_str[14] = '7'; - uuid_str[15] = "0123456789abcdef"[(bin[6] & 0xf0) >>4]; + uuid_str[15] = "0123456789abcdef"[(bin[6] & 0xf0) >> 4]; uuid_str[16] = "0123456789abcdef"[(bin[6] & 0x0f)]; - uuid_str[17] = "0123456789abcdef"[(bin[7] & 0xf0) >>4]; + uuid_str[17] = "0123456789abcdef"[(bin[7] & 0xf0) >> 4]; uuid_str[18] = '-'; - uuid_str[19] = "0123456789abcdef"[(0x8 | ((bin[7] & 0x0f) >>2))]; - uuid_str[20] = "0123456789abcdef"[(bin[7] & 0x03) | (bin[8] & 0xf0) >>6]; //See https://www.rfc-editor.org/rfc/rfc9562.html#version_field + uuid_str[19] = "0123456789abcdef"[(0x8 | ((bin[7] & 0x0f) >> 2))]; + uuid_str[20] = "0123456789abcdef" + [(bin[7] & 0x03) | + (bin[8] & 0xf0) >> + 6]; // See https://www.rfc-editor.org/rfc/rfc9562.html#version_field uuid_str[21] = "0123456789abcdef"[(bin[8] & 0x0f)]; - uuid_str[22] = "0123456789abcdef"[(bin[9] & 0xf0) >>4]; + uuid_str[22] = "0123456789abcdef"[(bin[9] & 0xf0) >> 4]; uuid_str[23] = '-'; - uuid_str[24] = "0123456789abcdef"[(bin[9] & 0x0f)]; - uuid_str[25] = "0123456789abcdef"[(bin[10] & 0xf0) >>4]; + uuid_str[24] = "0123456789abcdef"[(bin[9] & 0x0f)]; + uuid_str[25] = "0123456789abcdef"[(bin[10] & 0xf0) >> 4]; uuid_str[26] = "0123456789abcdef"[(bin[10] & 0x0f)]; - uuid_str[27] = "0123456789abcdef"[(bin[11] & 0xf0) >>4]; + uuid_str[27] = "0123456789abcdef"[(bin[11] & 0xf0) >> 4]; uuid_str[28] = "0123456789abcdef"[(bin[11] & 0x0f)]; - uuid_str[29] = "0123456789abcdef"[(bin[12] & 0xf0) >>4]; + uuid_str[29] = "0123456789abcdef"[(bin[12] & 0xf0) >> 4]; uuid_str[30] = "0123456789abcdef"[(bin[12] & 0x0f)]; - uuid_str[31] = "0123456789abcdef"[(bin[13] & 0xf0) >>4]; + uuid_str[31] = "0123456789abcdef"[(bin[13] & 0xf0) >> 4]; uuid_str[32] = "0123456789abcdef"[(bin[13] & 0x0f)]; - uuid_str[33] = "0123456789abcdef"[(bin[14] & 0xf0) >>4]; + uuid_str[33] = "0123456789abcdef"[(bin[14] & 0xf0) >> 4]; uuid_str[34] = "0123456789abcdef"[(bin[14] & 0x0f)]; - uuid_str[35] = "0123456789abcdef"[(bin[15] & 0xf0) >>4]; + uuid_str[35] = "0123456789abcdef"[(bin[15] & 0xf0) >> 4]; uuid_str[36] = '\0'; lua_pushfstring(L, uuid_str); diff --git a/tool/net/lrsa.c b/tool/net/lrsa.c index 73866a7b5..df1afd25e 100644 --- a/tool/net/lrsa.c +++ b/tool/net/lrsa.c @@ -115,7 +115,7 @@ int LuaGenerateKeyPair(lua_State *L) { // Call the C function to generate the key pair if (!GenerateKeyPair(&private_key, &private_len, &public_key, &public_len, - key_length)) { + key_length)) { lua_pushnil(L); lua_pushstring(L, "Failed to generate RSA key pair"); return 2; @@ -349,7 +349,7 @@ int LuaSign(lua_State *L) { // Call the C implementation signature = (unsigned char *)Sign(key_pem, (const unsigned char *)msg, - msg_len, hash_algo_str, &sig_len); + msg_len, hash_algo_str, &sig_len); if (!signature) { return luaL_error(L, "failed to sign message"); @@ -438,7 +438,7 @@ int LuaVerify(lua_State *L) { // Call the C implementation result = Verify(key_pem, (const unsigned char *)msg, msg_len, - (const unsigned char *)signature, sig_len, hash_algo_str); + (const unsigned char *)signature, sig_len, hash_algo_str); // Return boolean result (0 means valid signature) lua_pushboolean(L, result == 0); @@ -448,11 +448,11 @@ int LuaVerify(lua_State *L) { static const luaL_Reg kLuaRSA[] = { {"GenerateKeyPair", LuaGenerateKeyPair}, // - {"Sign", LuaSign}, // - {"Verify", LuaVerify}, // - {"Encrypt", LuaEncrypt}, // - {"Decrypt", LuaDecrypt}, // - {0}, // + {"Sign", LuaSign}, // + {"Verify", LuaVerify}, // + {"Encrypt", LuaEncrypt}, // + {"Decrypt", LuaDecrypt}, // + {0}, // }; int LuaRSA(lua_State *L) { diff --git a/tool/net/redbean.c b/tool/net/redbean.c index 284d41ec7..8015091bc 100644 --- a/tool/net/redbean.c +++ b/tool/net/redbean.c @@ -3116,22 +3116,22 @@ td { padding-right: 3em; }\r\n\ unassert(!pthread_mutex_unlock(&shared->children_mu)); } appends(&cpm.outbuf, "\r\n"); - and = ""; + and= ""; x = timespec_sub(timespec_real(), startserver).tv_sec; y = ldiv(x, 24L * 60 * 60); if (y.quot) { appendf(&cpm.outbuf, "%,ld day%s ", y.quot, y.quot == 1 ? "" : "s"); - and = "and "; + and= "and "; } y = ldiv(y.rem, 60 * 60); if (y.quot) { appendf(&cpm.outbuf, "%,ld hour%s ", y.quot, y.quot == 1 ? "" : "s"); - and = "and "; + and= "and "; } y = ldiv(y.rem, 60); if (y.quot) { appendf(&cpm.outbuf, "%,ld minute%s ", y.quot, y.quot == 1 ? "" : "s"); - and = "and "; + and= "and "; } appendf(&cpm.outbuf, "%s%,ld second%s of operation
\r\n", and, y.rem, y.rem == 1 ? "" : "s");