From b6d2b9d14b4a92c269932f8bee24046811ea984d Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Wed, 6 Jan 2021 09:56:50 +0100
Subject: [PATCH] MISC: Don't break some manual formating
---
src/mkv/write.c | 12 +++++++-----
src/module/module_repo.c | 4 +++-
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/mkv/write.c b/src/mkv/write.c
index fdbab551..ad9de592 100644
--- a/src/mkv/write.c
+++ b/src/mkv/write.c
@@ -170,13 +170,15 @@ metadata_from_path(char *const mkvfile, struct kara_metadata *meta)
reti = regexec(®ex, mkvfile, nmatch, pmatch, 0);
if (!reti) {
/* Match */
- memcpy(meta->category, mkvfile + pmatch[2].rm_so, pmatch[2].rm_eo - pmatch[2].rm_so);
- memcpy(meta->language, mkvfile + pmatch[3].rm_so, pmatch[3].rm_eo - pmatch[3].rm_so);
+ // *INDENT-OFF*
+ memcpy(meta->category, mkvfile + pmatch[2].rm_so, pmatch[2].rm_eo - pmatch[2].rm_so);
+ memcpy(meta->language, mkvfile + pmatch[3].rm_so, pmatch[3].rm_eo - pmatch[3].rm_so);
memcpy(meta->author_name, mkvfile + pmatch[4].rm_so, pmatch[4].rm_eo - pmatch[4].rm_so);
memcpy(meta->source_name, mkvfile + pmatch[5].rm_so, pmatch[5].rm_eo - pmatch[5].rm_so);
- memcpy(meta->song_type, mkvfile + pmatch[6].rm_so, pmatch[6].rm_eo - pmatch[6].rm_so);
- memcpy(msgbuf, mkvfile + pmatch[7].rm_so, pmatch[7].rm_eo - pmatch[7].rm_so);
- memcpy(meta->song_name, mkvfile + pmatch[8].rm_so, pmatch[8].rm_eo - pmatch[8].rm_so);
+ memcpy(meta->song_type, mkvfile + pmatch[6].rm_so, pmatch[6].rm_eo - pmatch[6].rm_so);
+ memcpy(msgbuf, mkvfile + pmatch[7].rm_so, pmatch[7].rm_eo - pmatch[7].rm_so);
+ memcpy(meta->song_name, mkvfile + pmatch[8].rm_so, pmatch[8].rm_eo - pmatch[8].rm_so);
+ // *INDENT-ON*
} else if (REG_NOMATCH == reti) {
LOG_ERROR("WRITER", "No match for: %s", mkvfile);
goto error;
diff --git a/src/module/module_repo.c b/src/module/module_repo.c
index 63ab1adf..5866a92f 100644
--- a/src/module/module_repo.c
+++ b/src/module/module_repo.c
@@ -49,7 +49,9 @@ struct module_repo_internal {
/* Worker threads */
struct worker_pool workers;
pthread_mutex_t mtx; /* Protect the updating field */
- volatile int updating : REPO_UPDATE_TYPE_COUNT;
+ // *INDENT-OFF*
+ volatile unsigned int updating : REPO_UPDATE_TYPE_COUNT; /* The correct size */
+ // *INDENT-ON*
/* The database and the queue */
struct queue *queue;
--
GitLab