From 23237f97b5a43e3bfa88ce1935ea7bb1ac912dc5 Mon Sep 17 00:00:00 2001 From: Jordan Bancino Date: Thu, 28 Sep 2023 19:16:45 -0400 Subject: [PATCH] Format source code and apply license. --- Cytoplasm/examples/PrintArgsAndEnv.c | 23 ++++++++++++ Cytoplasm/src/HttpRouter.c | 3 +- Cytoplasm/src/Int64.c | 4 +-- Cytoplasm/src/Json.c | 52 ++++++++++++++-------------- Cytoplasm/tools/j2s.c | 8 ++--- 5 files changed, 57 insertions(+), 33 deletions(-) diff --git a/Cytoplasm/examples/PrintArgsAndEnv.c b/Cytoplasm/examples/PrintArgsAndEnv.c index 5f86721..1b58108 100644 --- a/Cytoplasm/examples/PrintArgsAndEnv.c +++ b/Cytoplasm/examples/PrintArgsAndEnv.c @@ -1,3 +1,26 @@ +/* + * Copyright (C) 2022-2023 Jordan Bancino <@jordan:bancino.net> + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation files + * (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, merge, + * publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ #include #include diff --git a/Cytoplasm/src/HttpRouter.c b/Cytoplasm/src/HttpRouter.c index bd06c64..981a0f8 100644 --- a/Cytoplasm/src/HttpRouter.c +++ b/Cytoplasm/src/HttpRouter.c @@ -254,8 +254,9 @@ HttpRouterRoute(HttpRouter * router, char *path, void *args, void **ret) { /* pmatch[0] is the whole string, not the first * subexpression */ - char * substr; + char *substr; regmatch_t cpmatch; + for (i = 1; i < REG_MAX_SUB; i++) { cpmatch = pmatch[i]; diff --git a/Cytoplasm/src/Int64.c b/Cytoplasm/src/Int64.c index f2334d3..21f07f5 100644 --- a/Cytoplasm/src/Int64.c +++ b/Cytoplasm/src/Int64.c @@ -67,12 +67,12 @@ Int64Str(Int64 x, int base, char *out, size_t len) { x = Int64Add(x, Int64Create(0, 1)); } - #if 0 +#if 0 else if (Int64Eq(x, Int64Create(0x7FFFFFFF, 0xFFFFFFFF))) { x = Int64Sub(x, Int64Create(0, 1)); } - #endif +#endif if (base != 2 && base != 8 && base != 16 && neg) { diff --git a/Cytoplasm/src/Json.c b/Cytoplasm/src/Json.c index 83ad602..6922e14 100644 --- a/Cytoplasm/src/Json.c +++ b/Cytoplasm/src/Json.c @@ -606,7 +606,7 @@ JsonEncodeValue(JsonValue * value, Stream * out, int level) Array *arr; int length = 0; - char ibuf[INT64_STRBUF]; + char ibuf[INT64_STRBUF]; switch (value->type) { @@ -644,7 +644,7 @@ JsonEncodeValue(JsonValue * value, Stream * out, int level) length += JsonEncodeString(value->as.string, out); break; case JSON_INTEGER: - Int64Str(value->as.integer, 10, ibuf, INT64_STRBUF); + Int64Str(value->as.integer, 10, ibuf, INT64_STRBUF); length += StreamPrintf(out, "%s", ibuf); break; case JSON_FLOAT: @@ -1123,9 +1123,9 @@ JsonDecodeValue(JsonParserState * state) JsonValue *value; char *strValue; - Int64 iValue; - size_t i; - int neg; + Int64 iValue; + size_t i; + int neg; switch (state->tokenType) { @@ -1146,31 +1146,31 @@ JsonDecodeValue(JsonParserState * state) Free(strValue); break; case TOKEN_INTEGER: - iValue = Int64Create(0, 0); - i = 0; - neg = 0; + iValue = Int64Create(0, 0); + i = 0; + neg = 0; - while (state->token[i]) - { - int d; + while (state->token[i]) + { + int d; - if (i == 0 && !neg && state->token[i] == '-') - { - neg = 1; - i++; - continue; - } + if (i == 0 && !neg && state->token[i] == '-') + { + neg = 1; + i++; + continue; + } - d = state->token[i] - '0'; - iValue = Int64Mul(iValue, Int64Create(0, 10)); - iValue = Int64Add(iValue, Int64Create(0, d)); - i++; - } + d = state->token[i] - '0'; + iValue = Int64Mul(iValue, Int64Create(0, 10)); + iValue = Int64Add(iValue, Int64Create(0, d)); + i++; + } - if (neg) - { - iValue = Int64Neg(iValue); - } + if (neg) + { + iValue = Int64Neg(iValue); + } value = JsonValueInteger(iValue); break; case TOKEN_FLOAT: diff --git a/Cytoplasm/tools/j2s.c b/Cytoplasm/tools/j2s.c index b4bcdd9..2e6b5b4 100644 --- a/Cytoplasm/tools/j2s.c +++ b/Cytoplasm/tools/j2s.c @@ -1009,10 +1009,10 @@ Main(Array * args) StreamPrintf(implFile, " for (i = 0; i < ArraySize(val->%s); i++)\n", key); StreamPrintf(implFile, " {\n"); StreamPrintf(implFile, " %sFree(ArrayGet(val->%s, i));\n", (!isEnum && !isPrimitive) ? fieldType : "", key); - if (!isEnum && !isPrimitive) - { - StreamPrintf(implFile, " Free(ArrayGet(val->%s, i));\n", key); - } + if (!isEnum && !isPrimitive) + { + StreamPrintf(implFile, " Free(ArrayGet(val->%s, i));\n", key); + } StreamPrintf(implFile, " }\n"); StreamPrintf(implFile, " ArrayFree(val->%s);\n", key); StreamPrintf(implFile, " }\n");