merge upstream/main

4 files changed, 15 insertions, 15 deletions

diff --git a/shared-bindings/ipaddress/IPv4Address.c b/shared-bindings/ipaddress/IPv4Address.c
index e027f32d6..62a54560e 100644
--- a/shared-bindings/ipaddress/IPv4Address.c
+++ b/shared-bindings/ipaddress/IPv4Address.c
@@ -57,13 +57,13 @@ STATIC mp_obj_t ipaddress_ipv4address_make_new(const mp_obj_type_t *type, size_t
     const mp_obj_t address = args[ARG_address].u_obj;
 
     uint32_t value;
-    uint8_t* buf = NULL;
-    if (mp_obj_get_int_maybe(address, (mp_int_t*) &value)) {
+    uint8_t *buf = NULL;
+    if (mp_obj_get_int_maybe(address, (mp_int_t *)&value)) {
         // We're done.
-        buf = (uint8_t*) value;
+        buf = (uint8_t *)value;
     } else if (MP_OBJ_IS_STR(address)) {
         GET_STR_DATA_LEN(address, str_data, str_len);
-        if (!ipaddress_parse_ipv4address((const char*) str_data, str_len, &value)) {
+        if (!ipaddress_parse_ipv4address((const char *)str_data, str_len, &value)) {
             mp_raise_ValueError(translate("Not a valid IP string"));
         }
     } else {
@@ -139,7 +139,7 @@ STATIC mp_obj_t ipaddress_ipv4address_binary_op(mp_binary_op_t op, mp_obj_t lhs_
                 ipaddress_ipv4address_obj_t *rhs = MP_OBJ_TO_PTR(rhs_in);
                 return mp_obj_new_bool(
                     mp_obj_equal(common_hal_ipaddress_ipv4address_get_packed(lhs),
-                                 common_hal_ipaddress_ipv4address_get_packed(rhs)));
+                        common_hal_ipaddress_ipv4address_get_packed(rhs)));
 
             } else {
                 return mp_const_false;
@@ -177,7 +177,7 @@ STATIC void ipaddress_ipv4address_print(const mp_print_t *print, mp_obj_t self_i
     mp_obj_t address_bytes = common_hal_ipaddress_ipv4address_get_packed(self);
     mp_get_buffer_raise(address_bytes, &buf_info, MP_BUFFER_READ);
 
-    const uint8_t *buf = (uint8_t *) buf_info.buf;
+    const uint8_t *buf = (uint8_t *)buf_info.buf;
     mp_printf(print, "%d.%d.%d.%d", buf[0], buf[1], buf[2], buf[3]);
 }
 
@@ -194,5 +194,5 @@ const mp_obj_type_t ipaddress_ipv4address_type = {
     .print = ipaddress_ipv4address_print,
     .unary_op = ipaddress_ipv4address_unary_op,
     .binary_op = ipaddress_ipv4address_binary_op,
-    .locals_dict = (mp_obj_dict_t*)&ipaddress_ipv4address_locals_dict
+    .locals_dict = (mp_obj_dict_t *)&ipaddress_ipv4address_locals_dict
 };
diff --git a/shared-bindings/ipaddress/IPv4Address.h b/shared-bindings/ipaddress/IPv4Address.h
index b45cf3bac..46a52a0b2 100644
--- a/shared-bindings/ipaddress/IPv4Address.h
+++ b/shared-bindings/ipaddress/IPv4Address.h
@@ -32,7 +32,7 @@
 extern const mp_obj_type_t ipaddress_ipv4address_type;
 
 mp_obj_t common_hal_ipaddress_new_ipv4address(uint32_t value);
-void common_hal_ipaddress_ipv4address_construct(ipaddress_ipv4address_obj_t* self, uint8_t* buf, size_t len);
-mp_obj_t common_hal_ipaddress_ipv4address_get_packed(ipaddress_ipv4address_obj_t* self);
+void common_hal_ipaddress_ipv4address_construct(ipaddress_ipv4address_obj_t *self, uint8_t *buf, size_t len);
+mp_obj_t common_hal_ipaddress_ipv4address_get_packed(ipaddress_ipv4address_obj_t *self);
 
 #endif // MICROPY_INCLUDED_SHARED_BINDINGS_IPADDRESS_IPV4ADDRESS_H
diff --git a/shared-bindings/ipaddress/__init__.c b/shared-bindings/ipaddress/__init__.c
index 7ec2984ef..f768ec0ba 100644
--- a/shared-bindings/ipaddress/__init__.c
+++ b/shared-bindings/ipaddress/__init__.c
@@ -38,7 +38,7 @@
 //|
 
 
-bool ipaddress_parse_ipv4address(const char* str_data, size_t str_len, uint32_t* ip_out) {
+bool ipaddress_parse_ipv4address(const char *str_data, size_t str_len, uint32_t *ip_out) {
     size_t period_count = 0;
     size_t period_index[4] = {0, 0, 0, str_len};
     for (size_t i = 0; i < str_len; i++) {
@@ -62,7 +62,7 @@ bool ipaddress_parse_ipv4address(const char* str_data, size_t str_len, uint32_t*
         nlr_buf_t nlr;
         mp_obj_t octet;
         if (nlr_push(&nlr) == 0) {
-            octet = mp_parse_num_integer((const char*) str_data + last_period, period_index[i] - last_period, 10, NULL);
+            octet = mp_parse_num_integer((const char *)str_data + last_period, period_index[i] - last_period, 10, NULL);
             nlr_pop();
         } else {
             return false;
@@ -83,11 +83,11 @@ bool ipaddress_parse_ipv4address(const char* str_data, size_t str_len, uint32_t*
 
 STATIC mp_obj_t ipaddress_ip_address(mp_obj_t ip_in) {
     uint32_t value;
-    if (mp_obj_get_int_maybe(ip_in, (mp_int_t*) &value)) {
+    if (mp_obj_get_int_maybe(ip_in, (mp_int_t *)&value)) {
         // We're done.
     } else if (MP_OBJ_IS_STR(ip_in)) {
         GET_STR_DATA_LEN(ip_in, str_data, str_len);
-        if (!ipaddress_parse_ipv4address((const char*) str_data, str_len, &value)) {
+        if (!ipaddress_parse_ipv4address((const char *)str_data, str_len, &value)) {
             mp_raise_ValueError(translate("Not a valid IP string"));
         }
     } else {
@@ -109,5 +109,5 @@ STATIC MP_DEFINE_CONST_DICT(ipaddress_module_globals, ipaddress_module_globals_t
 
 const mp_obj_module_t ipaddress_module = {
     .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t*)&ipaddress_module_globals,
+    .globals = (mp_obj_dict_t *)&ipaddress_module_globals,
 };
diff --git a/shared-bindings/ipaddress/__init__.h b/shared-bindings/ipaddress/__init__.h
index a1c31775f..7c2e5c181 100644
--- a/shared-bindings/ipaddress/__init__.h
+++ b/shared-bindings/ipaddress/__init__.h
@@ -29,7 +29,7 @@
 
 #include "shared-module/ipaddress/__init__.h"
 
-bool ipaddress_parse_ipv4address(const char* ip_str, size_t len, uint32_t* ip_out);
+bool ipaddress_parse_ipv4address(const char *ip_str, size_t len, uint32_t *ip_out);
 
 mp_obj_t common_hal_ipaddress_new_ipv4address(uint32_t value);