Format source code and apply license.

This commit is contained in:
Jordan Bancino 2023-09-28 19:16:45 -04:00
parent 82ae2d4e41
commit 23237f97b5
5 changed files with 57 additions and 33 deletions

View file

@ -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 <Array.h> #include <Array.h>
#include <HashMap.h> #include <HashMap.h>

View file

@ -254,8 +254,9 @@ HttpRouterRoute(HttpRouter * router, char *path, void *args, void **ret)
{ {
/* pmatch[0] is the whole string, not the first /* pmatch[0] is the whole string, not the first
* subexpression */ * subexpression */
char * substr; char *substr;
regmatch_t cpmatch; regmatch_t cpmatch;
for (i = 1; i < REG_MAX_SUB; i++) for (i = 1; i < REG_MAX_SUB; i++)
{ {
cpmatch = pmatch[i]; cpmatch = pmatch[i];

View file

@ -67,12 +67,12 @@ Int64Str(Int64 x, int base, char *out, size_t len)
{ {
x = Int64Add(x, Int64Create(0, 1)); x = Int64Add(x, Int64Create(0, 1));
} }
#if 0 #if 0
else if (Int64Eq(x, Int64Create(0x7FFFFFFF, 0xFFFFFFFF))) else if (Int64Eq(x, Int64Create(0x7FFFFFFF, 0xFFFFFFFF)))
{ {
x = Int64Sub(x, Int64Create(0, 1)); x = Int64Sub(x, Int64Create(0, 1));
} }
#endif #endif
if (base != 2 && base != 8 && base != 16 && neg) if (base != 2 && base != 8 && base != 16 && neg)
{ {

View file

@ -606,7 +606,7 @@ JsonEncodeValue(JsonValue * value, Stream * out, int level)
Array *arr; Array *arr;
int length = 0; int length = 0;
char ibuf[INT64_STRBUF]; char ibuf[INT64_STRBUF];
switch (value->type) switch (value->type)
{ {
@ -644,7 +644,7 @@ JsonEncodeValue(JsonValue * value, Stream * out, int level)
length += JsonEncodeString(value->as.string, out); length += JsonEncodeString(value->as.string, out);
break; break;
case JSON_INTEGER: case JSON_INTEGER:
Int64Str(value->as.integer, 10, ibuf, INT64_STRBUF); Int64Str(value->as.integer, 10, ibuf, INT64_STRBUF);
length += StreamPrintf(out, "%s", ibuf); length += StreamPrintf(out, "%s", ibuf);
break; break;
case JSON_FLOAT: case JSON_FLOAT:
@ -1123,9 +1123,9 @@ JsonDecodeValue(JsonParserState * state)
JsonValue *value; JsonValue *value;
char *strValue; char *strValue;
Int64 iValue; Int64 iValue;
size_t i; size_t i;
int neg; int neg;
switch (state->tokenType) switch (state->tokenType)
{ {
@ -1146,31 +1146,31 @@ JsonDecodeValue(JsonParserState * state)
Free(strValue); Free(strValue);
break; break;
case TOKEN_INTEGER: case TOKEN_INTEGER:
iValue = Int64Create(0, 0); iValue = Int64Create(0, 0);
i = 0; i = 0;
neg = 0; neg = 0;
while (state->token[i]) while (state->token[i])
{ {
int d; int d;
if (i == 0 && !neg && state->token[i] == '-') if (i == 0 && !neg && state->token[i] == '-')
{ {
neg = 1; neg = 1;
i++; i++;
continue; continue;
} }
d = state->token[i] - '0'; d = state->token[i] - '0';
iValue = Int64Mul(iValue, Int64Create(0, 10)); iValue = Int64Mul(iValue, Int64Create(0, 10));
iValue = Int64Add(iValue, Int64Create(0, d)); iValue = Int64Add(iValue, Int64Create(0, d));
i++; i++;
} }
if (neg) if (neg)
{ {
iValue = Int64Neg(iValue); iValue = Int64Neg(iValue);
} }
value = JsonValueInteger(iValue); value = JsonValueInteger(iValue);
break; break;
case TOKEN_FLOAT: case TOKEN_FLOAT:

View file

@ -1009,10 +1009,10 @@ Main(Array * args)
StreamPrintf(implFile, " for (i = 0; i < ArraySize(val->%s); i++)\n", key); StreamPrintf(implFile, " for (i = 0; i < ArraySize(val->%s); i++)\n", key);
StreamPrintf(implFile, " {\n"); StreamPrintf(implFile, " {\n");
StreamPrintf(implFile, " %sFree(ArrayGet(val->%s, i));\n", (!isEnum && !isPrimitive) ? fieldType : "", key); StreamPrintf(implFile, " %sFree(ArrayGet(val->%s, i));\n", (!isEnum && !isPrimitive) ? fieldType : "", key);
if (!isEnum && !isPrimitive) if (!isEnum && !isPrimitive)
{ {
StreamPrintf(implFile, " Free(ArrayGet(val->%s, i));\n", key); StreamPrintf(implFile, " Free(ArrayGet(val->%s, i));\n", key);
} }
StreamPrintf(implFile, " }\n"); StreamPrintf(implFile, " }\n");
StreamPrintf(implFile, " ArrayFree(val->%s);\n", key); StreamPrintf(implFile, " ArrayFree(val->%s);\n", key);
StreamPrintf(implFile, " }\n"); StreamPrintf(implFile, " }\n");