Run clang-format and enable CI check for it (#755)
* pre-commit: Update and enable clang-format check There is newer version from clang-format so use that. We do not yet want 18 as that is little bit too new. * Format some thing by hand which clang-format "breaks" Clang-format will format some things little bit off in some cases. Format some things by hand so we get cleaner end result. * Run clang-format with ``` pre-commit run --all-files clang-format ``` We have already in previously checked places where clang-format does not make good format and ignored those (hopefully most of the things). --------- Co-authored-by: Kari Argillander <kari.argillander@fidelix.com>
This commit is contained in:
+14
-7
@@ -110,8 +110,9 @@ bool ethernet_init(char *if_name)
|
||||
int i;
|
||||
char msg[200];
|
||||
|
||||
if (ethernet_valid())
|
||||
if (ethernet_valid()) {
|
||||
ethernet_cleanup();
|
||||
}
|
||||
|
||||
/**
|
||||
* Find the interface user specified
|
||||
@@ -126,8 +127,9 @@ bool ethernet_init(char *if_name)
|
||||
}
|
||||
/* Scan the list printing every entry */
|
||||
for (dev = pcap_all_if; dev; dev = dev->next) {
|
||||
if (strcmp(if_name, dev->name) == 0)
|
||||
if (strcmp(if_name, dev->name) == 0) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
pcap_freealldevs(pcap_all_if); /* we don't need it anymore */
|
||||
if (dev == NULL) {
|
||||
@@ -161,8 +163,9 @@ bool ethernet_init(char *if_name)
|
||||
LogError("ethernet.c: error in PacketRequest()\n");
|
||||
return false;
|
||||
}
|
||||
for (i = 0; i < 6; ++i)
|
||||
for (i = 0; i < 6; ++i) {
|
||||
Ethernet_MAC_Address[i] = pOidData->Data[i];
|
||||
}
|
||||
PacketCloseAdapter(lpAdapter);
|
||||
|
||||
/**
|
||||
@@ -317,11 +320,13 @@ uint16_t ethernet_receive(
|
||||
msg, sizeof(), "ethernet.c: error in receiving packet: %s\n",
|
||||
pcap_geterr(pcap_eth802_fp));
|
||||
return 0;
|
||||
} else if (res == 0)
|
||||
} else if (res == 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (header->len == 0 || header->caplen == 0)
|
||||
if (header->len == 0 || header->caplen == 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* the signature of an 802.2 BACnet packet */
|
||||
if ((pkt_data[14] != 0x82) && (pkt_data[15] != 0x82)) {
|
||||
@@ -343,11 +348,13 @@ uint16_t ethernet_receive(
|
||||
(void)decode_unsigned16(&pkt_data[12], &pdu_len);
|
||||
pdu_len -= 3 /* DSAP, SSAP, LLC Control */;
|
||||
/* copy the buffer into the PDU */
|
||||
if (pdu_len < max_pdu)
|
||||
if (pdu_len < max_pdu) {
|
||||
memmove(&pdu[0], &pkt_data[17], pdu_len);
|
||||
}
|
||||
/* ignore packets that are too large */
|
||||
else
|
||||
else {
|
||||
pdu_len = 0;
|
||||
}
|
||||
|
||||
return pdu_len;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user