[commit] master: don't stop validating Channel config after first error
mailbox synchronizer
Brought to you by:
ossi
|
From: Oswald B. <os...@us...> - 2022-06-19 14:37:38
|
commit bf59636f0f0bf8767f098a2bc689f10476414400
Author: Oswald Buddenhagen <os...@us...>
Date: Sun Jun 5 19:27:14 2022 +0200
don't stop validating Channel config after first error
src/config.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/config.c b/src/config.c
index 2771a59b..cec2be86 100644
--- a/src/config.c
+++ b/src/config.c
@@ -522,17 +522,17 @@ load_config( const char *where )
if (!channel->stores[F]) {
error( "channel '%s' refers to no far side store\n", channel->name );
cfile.err = 1;
- } else if (!channel->stores[N]) {
+ }
+ if (!channel->stores[N]) {
error( "channel '%s' refers to no near side store\n", channel->name );
cfile.err = 1;
- } else if (merge_ops( cops, channel->ops, channel->name )) {
+ }
+ if (merge_ops( cops, channel->ops, channel->name ))
cfile.err = 1;
- } else {
- if (max_size != UINT_MAX) {
- if (!max_size)
- max_size = UINT_MAX;
- channel->stores[F]->max_size = channel->stores[N]->max_size = max_size;
- }
+ if (max_size != UINT_MAX && !cfile.err) {
+ if (!max_size)
+ max_size = UINT_MAX;
+ channel->stores[F]->max_size = channel->stores[N]->max_size = max_size;
}
*channelapp = channel;
channelapp = &channel->next;
|