all: Reformat C and Python source code with tools/codeformat.py.

This is run with uncrustify 0.70.1, and black 19.10b0.

3 files changed, 36 insertions, 16 deletions

diff --git a/lib/netutils/dhcpserver.c b/lib/netutils/dhcpserver.c
index 476eb3d69b..7f97ee6e46 100644
--- a/lib/netutils/dhcpserver.c
+++ b/lib/netutils/dhcpserver.c
@@ -99,7 +99,7 @@ static int dhcp_socket_new_dgram(struct udp_pcb **udp, void *cb_data, udp_recv_f
     }
 
     // Register callback
-    udp_recv(*udp, cb_udp_recv, (void*)cb_data);
+    udp_recv(*udp, cb_udp_recv, (void *)cb_data);
 
     return 0; // success
 }
@@ -202,7 +202,7 @@ static void dhcp_server_process(void *arg, struct udp_pcb *upcb, struct pbuf *p,
     dhcp_msg.op = DHCPOFFER;
     memcpy(&dhcp_msg.yiaddr, &d->ip.addr, 4);
 
-    uint8_t *opt = (uint8_t*)&dhcp_msg.options;
+    uint8_t *opt = (uint8_t *)&dhcp_msg.options;
     opt += 4; // assume magic cookie: 99, 130, 83, 99
 
     switch (opt[2]) {
@@ -281,7 +281,7 @@ static void dhcp_server_process(void *arg, struct udp_pcb *upcb, struct pbuf *p,
     opt_write_u32(&opt, DHCP_OPT_DNS, DEFAULT_DNS); // can have mulitple addresses
     opt_write_u32(&opt, DHCP_OPT_IP_LEASE_TIME, DEFAULT_LEASE_TIME_S);
     *opt++ = DHCP_OPT_END;
-    dhcp_socket_sendto(&d->udp, &dhcp_msg, opt - (uint8_t*)&dhcp_msg, 0xffffffff, PORT_DHCP_CLIENT);
+    dhcp_socket_sendto(&d->udp, &dhcp_msg, opt - (uint8_t *)&dhcp_msg, 0xffffffff, PORT_DHCP_CLIENT);
 
 ignore_request:
     pbuf_free(p);
diff --git a/lib/netutils/netutils.c b/lib/netutils/netutils.c
index 073f46b199..917cd83310 100644
--- a/lib/netutils/netutils.c
+++ b/lib/netutils/netutils.c
@@ -64,7 +64,7 @@ void netutils_parse_ipv4_addr(mp_obj_t addr_in, uint8_t *out_ip, netutils_endian
     }
     const char *s = addr_str;
     const char *s_top = addr_str + addr_len;
-    for (mp_uint_t i = 3 ; ; i--) {
+    for (mp_uint_t i = 3; ; i--) {
         mp_uint_t val = 0;
         for (; s < s_top && *s != '.'; s++) {
             val = val * 10 + *s - '0';
diff --git a/lib/netutils/trace.c b/lib/netutils/trace.c
index 7c79713b32..1610966c2d 100644
--- a/lib/netutils/trace.c
+++ b/lib/netutils/trace.c
@@ -44,10 +44,14 @@ static void dump_hex_bytes(const mp_print_t *print, size_t len, const uint8_t *b
 static const char *ethertype_str(uint16_t type) {
     // A value between 0x0000 - 0x05dc (inclusive) indicates a length, not type
     switch (type) {
-        case 0x0800: return "IPv4";
-        case 0x0806: return "ARP";
-        case 0x86dd: return "IPv6";
-        default: return NULL;
+        case 0x0800:
+            return "IPv4";
+        case 0x0806:
+            return "ARP";
+        case 0x86dd:
+            return "IPv6";
+        default:
+            return NULL;
     }
 }
 
@@ -113,14 +117,30 @@ void netutils_ethernet_trace(const mp_print_t *print, size_t len, const uint8_t
                     buf += n;
                     mp_printf(print, " opts:");
                     switch (buf[6]) {
-                        case 1: mp_printf(print, " DISCOVER"); break;
-                        case 2: mp_printf(print, " OFFER"); break;
-                        case 3: mp_printf(print, " REQUEST"); break;
-                        case 4: mp_printf(print, " DECLINE"); break;
-                        case 5: mp_printf(print, " ACK"); break;
-                        case 6: mp_printf(print, " NACK"); break;
-                        case 7: mp_printf(print, " RELEASE"); break;
-                        case 8: mp_printf(print, " INFORM"); break;
+                        case 1:
+                            mp_printf(print, " DISCOVER");
+                            break;
+                        case 2:
+                            mp_printf(print, " OFFER");
+                            break;
+                        case 3:
+                            mp_printf(print, " REQUEST");
+                            break;
+                        case 4:
+                            mp_printf(print, " DECLINE");
+                            break;
+                        case 5:
+                            mp_printf(print, " ACK");
+                            break;
+                        case 6:
+                            mp_printf(print, " NACK");
+                            break;
+                        case 7:
+                            mp_printf(print, " RELEASE");
+                            break;
+                        case 8:
+                            mp_printf(print, " INFORM");
+                            break;
                     }
                 }
             } else {