From 7544a97c7de553af13b7640d6761afb65e489dfb Mon Sep 17 00:00:00 2001 From: Jordan Bancino Date: Wed, 23 Nov 2022 14:56:31 +0000 Subject: [PATCH] Format source code, add .exrc --- .exrc | 2 ++ src/Db.c | 28 ++++++++++++++++++---------- src/Telodendria.c | 12 ++++++------ src/Util.c | 8 ++++---- 4 files changed, 30 insertions(+), 20 deletions(-) create mode 100644 .exrc diff --git a/.exrc b/.exrc new file mode 100644 index 0000000..dea8c9e --- /dev/null +++ b/.exrc @@ -0,0 +1,2 @@ +set tabstop=4 +set expandtab diff --git a/src/Db.c b/src/Db.c index cbbee49..045b630 100644 --- a/src/Db.c +++ b/src/Db.c @@ -407,10 +407,10 @@ DbLockFromArr(Db * db, Array * args) { db->leastRecent = ref->next; } - else - { - ref->prev->next = ref->next; - } + else + { + ref->prev->next = ref->next; + } ref->prev = db->mostRecent; ref->next = NULL; @@ -423,6 +423,9 @@ DbLockFromArr(Db * db, Array * args) } else { + Array *name = ArrayCreate(); + size_t i; + /* Not in cache; load from disk */ ref = Malloc(sizeof(DbRef)); @@ -448,7 +451,12 @@ DbLockFromArr(Db * db, Array * args) ref->ts = UtilServerTs(); ref->size = DbComputeSize(ref->json); - ref->name = ArrayDuplicate(args); + + for (i = 0; i < ArraySize(args); i++) + { + ArrayAdd(name, UtilStringDuplicate(ArrayGet(args, i))); + } + ref->name = name; HashMapSet(db->cache, hash, ref); db->cacheSize += ref->size; @@ -512,7 +520,7 @@ DbCreate(Db * db, size_t nArgs,...) return NULL; } - Free(dir); + Free(dir); fp = fopen(file, "w"); Free(file); @@ -564,10 +572,10 @@ DbUnlock(Db * db, DbRef * ref) rewind(ref->fp); if (ftruncate(fileno(ref->fp), 0) < 0) - { - pthread_mutex_unlock(&db->lock); - return 0; - } + { + pthread_mutex_unlock(&db->lock); + return 0; + } JsonEncode(ref->json, ref->fp); diff --git a/src/Telodendria.c b/src/Telodendria.c index fce8265..f48c7e5 100644 --- a/src/Telodendria.c +++ b/src/Telodendria.c @@ -205,12 +205,12 @@ main(int argc, char **argv) goto finish; } - if (!configArg) - { - Log(lc, LOG_ERROR, "No configuration file specified."); - exit = EXIT_FAILURE; - goto finish; - } + if (!configArg) + { + Log(lc, LOG_ERROR, "No configuration file specified."); + exit = EXIT_FAILURE; + goto finish; + } else if (strcmp(configArg, "-") == 0) { configFile = stdin; diff --git a/src/Util.c b/src/Util.c index e12a43b..b53eed6 100644 --- a/src/Util.c +++ b/src/Util.c @@ -235,10 +235,10 @@ UtilStringConcat(char *str1, char *str2) { strcpy(ret, str2); } - else - { - strcpy(ret, ""); - } + else + { + strcpy(ret, ""); + } } return ret;