From 1e808448313b96b6080cc659a8929f4235ee5cb4 Mon Sep 17 00:00:00 2001 From: Fufu Fang Date: Wed, 26 Jul 2023 07:46:24 +0800 Subject: [PATCH] ran the code through formatter --- src/config.h | 4 ++-- src/link.c | 9 +++------ src/sonic.c | 31 ++++++++++++++++--------------- 3 files changed, 21 insertions(+), 23 deletions(-) diff --git a/src/config.h b/src/config.h index 9a8c9e2..df56c2d 100644 --- a/src/config.h +++ b/src/config.h @@ -24,9 +24,9 @@ #define DEFAULT_NETWORK_MAX_CONNS 10 /** - * \brief The default refresh_timeout + * \brief The default refresh_timeout */ -#define DEFAULT_REFRESH_TIMEOUT 86400 +#define DEFAULT_REFRESH_TIMEOUT 86400 /** * \brief Operation modes diff --git a/src/link.c b/src/link.c index ba8d945..659f186 100644 --- a/src/link.c +++ b/src/link.c @@ -501,8 +501,7 @@ static void LinkTable_invalid_reset(LinkTable *linktbl) void LinkTable_free(LinkTable *linktbl) { - if (linktbl) - { + if (linktbl) { for (int i = 0; i < linktbl->num; i++) { LinkTable_free(linktbl->links[i]->next_table); FREE(linktbl->links[i]); @@ -755,11 +754,9 @@ LinkTable *path_to_Link_LinkTable_new(const char *path) tmp_link = link; } - if (next_table) - { + if (next_table) { time_t time_now = time(NULL); - if (time_now - next_table->index_time > CONFIG.refresh_timeout) - { + if (time_now - next_table->index_time > CONFIG.refresh_timeout) { /* refresh directory contents */ LinkTable_free(next_table); next_table = NULL; diff --git a/src/sonic.c b/src/sonic.c index 106de57..563af3e 100644 --- a/src/sonic.c +++ b/src/sonic.c @@ -319,27 +319,28 @@ XML_parser_general(void *data, const char *elem, const char **attr) LinkTable_add(linktbl, link); } -static void sanitise_LinkTable(LinkTable *linktbl) { +static void sanitise_LinkTable(LinkTable *linktbl) +{ for (int i = 0; i < linktbl->num; i++) { - if (!strcmp(linktbl->links[i]->linkname, ".")) { + if (!strcmp(linktbl->links[i]->linkname, ".")) { /* Note the super long sanitised name to avoid collision */ - strcpy(linktbl->links[i]->linkname, "__DOT__"); - } + strcpy(linktbl->links[i]->linkname, "__DOT__"); + } - if (!strcmp(linktbl->links[i]->linkname, "/")) { + if (!strcmp(linktbl->links[i]->linkname, "/")) { /* Ditto */ - strcpy(linktbl->links[i]->linkname, "__FORWARD-SLASH__"); - } + strcpy(linktbl->links[i]->linkname, "__FORWARD-SLASH__"); + } - for (size_t j = 0; j < strlen(linktbl->links[i]->linkname); j++) { - if (linktbl->links[i]->linkname[j] == '/') { - linktbl->links[i]->linkname[j] = '-'; - } - } + for (size_t j = 0; j < strlen(linktbl->links[i]->linkname); j++) { + if (linktbl->links[i]->linkname[j] == '/') { + linktbl->links[i]->linkname[j] = '-'; + } + } - if (linktbl->links[i]->next_table != NULL) { - sanitise_LinkTable(linktbl->links[i]->next_table); - } + if (linktbl->links[i]->next_table != NULL) { + sanitise_LinkTable(linktbl->links[i]->next_table); + } } }