fix(clang-format): Proper formatting for libjansson macros

Signed-off-by: Philipp Jungkamp <philipp.jungkamp@rwth-aachen.de>

Author: pjungkamp

.clang-format

@@ -22,3 +22,11 @@ IncludeCategories:
     Priority: 2
   - Regex: '^".*"$'
     Priority: 4
+
+# Add libjansson foreach macros
+ForEachMacros:
+  - 'json_array_foreach'
+  - 'json_object_foreach'
+  - 'json_object_foreach_safe'
+  - 'json_object_keylen_foreach'
+  - 'json_object_keylen_foreach_safe'

common/lib/log.cpp

@@ -141,8 +141,8 @@ void Log::parse(json_t *json) {
     json_t *json_expression;
 
     // cppcheck-suppress unknownMacro
-    json_array_foreach(json_expressions, i, json_expression)
-        expressions.emplace_back(json_expression);
+    json_array_foreach (json_expressions, i, json_expression)
+      expressions.emplace_back(json_expression);
   }
 }
 

fpga/include/villas/fpga/card_parser.hpp

@@ -44,7 +44,7 @@ class CardParser {
     // Parse ignored ip names to list
     size_t index;
     json_t *value;
-    json_array_foreach(ignored_ips_array, index, value) {
+    json_array_foreach (ignored_ips_array, index, value) {
       ignored_ip_names.push_back(json_string_value(value));
     }
 

fpga/lib/card.cpp

@@ -179,7 +179,7 @@ void CardFactory::loadSwitch(std::shared_ptr<Card> card, json_t *json_paths) {
 
     size_t i;
     json_t *json_path;
-    json_array_foreach(json_paths, i, json_path) {
+    json_array_foreach (json_paths, i, json_path) {
       const char *from, *to;
       int reverse = 0;
 

fpga/lib/core.cpp

@@ -44,7 +44,7 @@ std::list<IpIdentifier> CoreFactory::parseIpIdentifier(json_t *json_ips) {
 
   const char *ipName;
   json_t *json_ip;
-  json_object_foreach(json_ips, ipName, json_ip) {
+  json_object_foreach (json_ips, ipName, json_ip) {
     const char *vlnv;
 
     json_error_t err;
@@ -168,7 +168,7 @@ CoreFactory::configureIps(std::list<IpIdentifier> orderedIps, json_t *json_ips,
 
       const char *irqName;
       json_t *json_irq;
-      json_object_foreach(json_irqs, irqName, json_irq) {
+      json_object_foreach (json_irqs, irqName, json_irq) {
         const char *irqEntry = json_string_value(json_irq);
 
         auto tokens = utils::tokenize(irqEntry, ":");
@@ -223,7 +223,7 @@ CoreFactory::configureIps(std::list<IpIdentifier> orderedIps, json_t *json_ips,
       // Now find all slave address spaces this master can access
       const char *bus_name;
       json_t *json_bus;
-      json_object_foreach(json_memory_view, bus_name, json_bus) {
+      json_object_foreach (json_memory_view, bus_name, json_bus) {
 
         // This IP has a memory view => it is a bus master somewhere
 
@@ -239,11 +239,11 @@ CoreFactory::configureIps(std::list<IpIdentifier> orderedIps, json_t *json_ips,
 
         const char *instance_name;
         json_t *json_instance;
-        json_object_foreach(json_bus, instance_name, json_instance) {
+        json_object_foreach (json_bus, instance_name, json_instance) {
 
           const char *block_name;
           json_t *json_block;
-          json_object_foreach(json_instance, block_name, json_block) {
+          json_object_foreach (json_instance, block_name, json_block) {
 
             json_int_t base, high, size;
             json_error_t err;

fpga/lib/ips/pcie.cpp

@@ -111,7 +111,7 @@ void AxiPciExpressBridgeFactory::parse(Core &ip, json_t *cfg) {
 
     json_t *json_bar;
     const char *bar_name;
-    json_object_foreach(json_bars, bar_name, json_bar) {
+    json_object_foreach (json_bars, bar_name, json_bar) {
       unsigned int translation;
 
       json_error_t err;

fpga/lib/node.cpp

@@ -30,7 +30,7 @@ void NodeFactory::parse(Core &ip, json_t *cfg) {
   if (json_ports && json_is_array(json_ports)) {
     size_t index;
     json_t *json_port;
-    json_array_foreach(json_ports, index, json_port) {
+    json_array_foreach (json_ports, index, json_port) {
       if (not json_is_object(json_port))
         throw ConfigError(json_port, "", "Port {} is not an object", index);
 

fpga/lib/pcie_card.cpp

@@ -70,7 +70,7 @@ PCIeCardFactory::make(json_t *json_card, std::string card_name,
   // Parse ignored ip names to list
   size_t index;
   json_t *value;
-  json_array_foreach(ignored_ips_array, index, value) {
+  json_array_foreach (ignored_ips_array, index, value) {
     card->ignored_ip_names.push_back(json_string_value(value));
   }
 

fpga/lib/utils.cpp

@@ -280,7 +280,7 @@ int fpga::createCards(json_t *config,
   const char *card_name;
   json_t *json_card;
   std::shared_ptr<fpga::Card> card;
-  json_object_foreach(fpgas, card_name, json_card) {
+  json_object_foreach (fpgas, card_name, json_card) {
     card = createCard(json_card, searchPath, vfioContainer, card_name);
     if (card != nullptr) {
       cards.push_back(card);

lib/api/universal.cpp

@@ -22,7 +22,7 @@ void ChannelList::parse(json_t *json, bool readable, bool writable) {
 
   size_t i;
   json_t *json_channel;
-  json_array_foreach(json, i, json_channel) {
+  json_array_foreach (json, i, json_channel) {
     auto channel = std::make_shared<Channel>();
 
     channel->parse(json_channel);
@@ -73,7 +73,7 @@ void Channel::parse(json_t *json) {
 
       range_options.clear();
 
-      json_array_foreach(json_range, i, json_option) {
+      json_array_foreach (json_range, i, json_option) {
         if (!json_is_string(json_option))
           throw ConfigError(json, err, "node-config-node-api-signals-range",
                             "Channel range options must be strings");