Skip to content
This repository was archived by the owner on Feb 16, 2025. It is now read-only.

Commit a2f699f

Browse files
restyled-commitsBujuhu
authored andcommitted
Restyled by clang-format
1 parent c3c9201 commit a2f699f

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

src/plugins/toml/testmod_toml.c

+13-11
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ static void testWriteReadComments (void);
177177
static void testWriteReadCommentsArray (void);
178178
static void testWriteReadOrderTableNonTable (void);
179179
static void testWriteReadNull (void);
180-
static void testWriteReadBogusMetaMustError(void);
180+
static void testWriteReadBogusMetaMustError (void);
181181
// static void testWriteReadBase64(void);
182182
static Key * addKey (KeySet * ks, const char * name, const char * value, size_t size, const char * orig, const char * type,
183183
const char * array, const char * tomltype, int order);
@@ -343,7 +343,7 @@ static void testWriteRead (const char * _prefix)
343343
testWriteReadInlineTableInArray ();
344344
testWriteReadArrayInlineTableAlternating ();
345345
testWriteReadOrderTableNonTable ();
346-
testWriteReadBogusMetaMustError();
346+
testWriteReadBogusMetaMustError ();
347347
prefix = NULL;
348348
}
349349

@@ -460,17 +460,19 @@ static void testWriteReadNull (void)
460460
TEST_WR_FOOT;
461461
}
462462

463-
static void testWriteReadBogusMetaMustError (void)
463+
static void testWriteReadBogusMetaMustError (void)
464464
{
465-
TEST_WR_HEAD; \
465+
TEST_WR_HEAD;
466+
467+
char * fileName = "test_write_read.toml";
466468
WRITE_KEY ("asdf");
467-
SET_META("asdf", "asdf");
468-
writeFile("test_write_read.toml", writeKs, ELEKTRA_PLUGIN_STATUS_ERROR);
469-
keyDel (lastKey);
470-
ksDel (expectedKs); \
471-
ksDel (writeKs); \
472-
printf ("End Test: %s\n\n", __func__);
473-
remove (filename); \
469+
SET_META ("asdf", "asdf");
470+
writeFile (fileName, writeKs, ELEKTRA_PLUGIN_STATUS_ERROR);
471+
keyDel (lastKey);
472+
ksDel (expectedKs);
473+
ksDel (writeKs);
474+
printf ("End Test: %s\n\n", __func__);
475+
remove (fileName);
474476
}
475477

476478
/*static void testWriteReadBase64 (void)

src/plugins/toml/write.c

+6-8
Original file line numberDiff line numberDiff line change
@@ -858,14 +858,12 @@ static int collectComments (CommentList ** comments, Key * key, Writer * writer)
858858
subDepth++;
859859
pos += elektraStrLen (pos);
860860
}
861-
//Accept valid metakeys, throw error for everything else
862-
} else if(elektraStrCmp(pos, "order") != 0 &&
863-
elektraStrCmp(pos, "type") != 0 &&
864-
elektraStrCmp(pos, "tomltype") != 0 &&
865-
elektraStrCmp(pos, "origvalue") != 0 &&
866-
elektraStrCmp(pos, "binary") != 0 &&
867-
elektraStrCmp(pos, "array") != 0) {
868-
ELEKTRA_SET_RESOURCE_ERRORF(key, "The Metakey %s is not supported by TOML", keyString(meta));
861+
// Accept valid metakeys, throw error for everything else
862+
}
863+
else if (elektraStrCmp (pos, "order") != 0 && elektraStrCmp (pos, "type") != 0 && elektraStrCmp (pos, "tomltype") != 0 &&
864+
elektraStrCmp (pos, "origvalue") != 0 && elektraStrCmp (pos, "binary") != 0 && elektraStrCmp (pos, "array") != 0)
865+
{
866+
ELEKTRA_SET_RESOURCE_ERRORF (key, "The Metakey %s is not supported by TOML", keyString (meta));
869867
return -1;
870868
}
871869
}

0 commit comments

Comments
 (0)