Changeset f4a42661 in mainline

Timestamp:

2023-10-22T14:04:49Z (14 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

master, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

590cb6d2

Parents:

b2cbc0b (diff), c63c2bb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge fixes to issues found while updating toolchain

Files:

• meson.build (modified) (1 diff)
• meson/part/compiler_args/meson.build (modified) (2 diffs)
• meson/part/extra_targets/meson.build (modified) (3 diffs)
• uspace/app/wifi_supplicant/wifi_supplicant.c (modified) (2 diffs)
• uspace/drv/nic/ar9271/wmi.c (modified) (4 diffs)
• uspace/lib/cpp/include/__bits/adt/hash_table.hpp (modified) (1 diff)
• uspace/lib/cpp/include/__bits/adt/rbtree.hpp (modified) (1 diff)
• uspace/lib/cpp/include/__bits/string/string.hpp (modified) (2 diffs)
• uspace/lib/cpp/src/__bits/unwind.cpp (modified) (1 diff)
• uspace/lib/cpp/src/future.cpp (modified) (1 diff)
• uspace/lib/ui/test/window.c (modified) (1 diff)
• uspace/lib/usbdev/include/usb/dev/device.h (modified) (1 diff)
• uspace/srv/hid/output/proto/vt100.c (modified) (1 diff)

meson.build

@@ -36 +36 @@
     [ 'c', 'cpp' ],
     default_options : ['buildtype=plain', 'c_std=gnu11', 'cpp_std=c++17', 'warning_level=2', 'werror=false', 'b_staticpic=false', 'prefix=/' ],
-    meson_version: '>=0.50.1',
+    meson_version: '>=0.55.0',
 )
 

meson/part/compiler_args/meson.build

@@ -60 +60 @@
         '-Wall',
         '-Wextra',
-        '-Werror-implicit-function-declaration',
         '-Wwrite-strings',
         '-Wunknown-pragmas',
@@ -92 +91 @@
 extra_cflags = extra_common_flags + [
         '-Wmissing-prototypes',
+        '-Werror-implicit-function-declaration',
 
         '-Wno-missing-braces',

meson/part/extra_targets/meson.build

@@ -34 +34 @@
                 '--',
                 meson.build_root(),
-                config_py.path(),
+                config_py.full_path(),
                 meson.source_root() / 'HelenOS.config',
                 meson.source_root() / 'defaults',
@@ -51 +51 @@
                         '--',
                         meson.build_root(),
-                        config_py.path(),
+                        config_py.full_path(),
                         meson.source_root() / 'HelenOS.config',
                         meson.source_root() / 'defaults',
@@ -77 +77 @@
                 '--',
                 meson.source_root() / 'doxygen',
-                doxygen.path(),
+                doxygen.full_path(),
                 _dox_cfg,
         ])

uspace/app/wifi_supplicant/wifi_supplicant.c

@@ -75 +75 @@
 }
 
-static char *nic_addr_format(nic_address_t *addr)
-{
-        char *str;
-        int rc = asprintf(&str, "%02x:%02x:%02x:%02x:%02x:%02x",
+static void nic_addr_format(nic_address_t *addr, char *out, size_t out_size)
+{
+        snprintf(out, out_size, "%02x:%02x:%02x:%02x:%02x:%02x",
             addr->address[0], addr->address[1], addr->address[2],
             addr->address[3], addr->address[4], addr->address[5]);
-
-        if (rc < 0)
-                return NULL;
-
-        return str;
 }
 
@@ -263 +257 @@
         for (uint8_t i = 0; i < scan_results.length; i++) {
                 ieee80211_scan_result_t result = scan_results.results[i];
+                char mac_addr_hex[18];
+                nic_addr_format(&result.bssid, mac_addr_hex, 18);
 
                 printf("%16.16s %17s %4d %5s %5s %7s %7s\n",
-                    result.ssid, nic_addr_format(&result.bssid),
+                    result.ssid, mac_addr_hex,
                     result.channel,
                     enum_name(ieee80211_security_type_strs, result.security.type),

uspace/drv/nic/ar9271/wmi.c

@@ -230 +230 @@
         size_t buffer_size = header_size + command_length;
         void *buffer = malloc(buffer_size);
+        if (buffer == NULL) {
+                usb_log_error("Failed to allocate WMI message buffer (out of memory).\n");
+                return ENOMEM;
+        }
 
         if (command_buffer != NULL)
@@ -241 +245 @@
             host2uint16_t_be(++htc_device->sequence_number);
 
-        /* Send message. */
+        /* Send message (buffer will not be needed afterwards regardless of result). */
         errno_t rc = htc_send_control_message(htc_device, buffer, buffer_size,
             htc_device->endpoints.wmi_endpoint);
-        if (rc != EOK) {
-                free(buffer);
+        free(buffer);
+        if (rc != EOK) {
                 usb_log_error("Failed to send WMI message. Error: %s\n", str_error_name(rc));
                 return rc;
         }
-
-        free(buffer);
 
         bool clean_resp_buffer = false;
@@ -267 +269 @@
                     response_buffer_size, NULL);
                 if (rc != EOK) {
-                        free(buffer);
                         usb_log_error("Failed to receive WMI message response. "
                             "Error: %s\n", str_error_name(rc));
@@ -275 +276 @@
                 if (response_buffer_size < sizeof(htc_frame_header_t) +
                     sizeof(wmi_command_header_t)) {
-                        free(buffer);
                         usb_log_error("Corrupted response received.\n");
                         return EINVAL;

uspace/lib/cpp/include/__bits/adt/hash_table.hpp

@@ -252 +252 @@
             void swap(hash_table& other)
                 noexcept(allocator_traits<allocator_type>::is_always_equal::value &&
-                         noexcept(swap(declval<Hasher&>(), declval<Hasher&>())) &&
-                         noexcept(swap(declval<KeyEq&>(), declval<KeyEq&>())))
+                         noexcept(std::swap(declval<Hasher&>(), declval<Hasher&>())) &&
+                         noexcept(std::swap(declval<KeyEq&>(), declval<KeyEq&>())))
             {
                 std::swap(table_, other.table_);

uspace/lib/cpp/include/__bits/adt/rbtree.hpp

@@ -233 +233 @@
             void swap(rbtree& other)
                 noexcept(allocator_traits<allocator_type>::is_always_equal::value &&
-                         noexcept(swap(declval<KeyComp&>(), declval<KeyComp&>())))
+                         noexcept(std::swap(declval<KeyComp&>(), declval<KeyComp&>())))
             {
                 std::swap(root_, other.root_);

uspace/lib/cpp/include/__bits/string/string.hpp

@@ -521 +521 @@
 
             basic_string(size_type n, value_type c, const allocator_type& alloc = allocator_type{})
-                : data_{}, size_{n}, capacity_{n}, allocator_{alloc}
+                : data_{}, size_{n}, capacity_{n + 1}, allocator_{alloc}
             {
                 data_ = allocator_.allocate(capacity_);
@@ -908 +908 @@
             {
                 // TODO: if (n > max_size()) throw length_error.
-                resize_without_copy_(n);
+                resize_without_copy_(n + 1);
                 traits_type::copy(begin(), str, n);
                 size_ = n;

uspace/lib/cpp/src/__bits/unwind.cpp

@@ -30 +30 @@
 #include <cstdint>
 #include <cstdlib>
+#include <typeinfo>
 
 namespace __cxxabiv1

uspace/lib/cpp/src/future.cpp

@@ -84 +84 @@
     const char* future_error::what() const noexcept
     {
-        return code().message().c_str();
+        /*
+         * FIXME
+         * Following code would be optimal but the message string is
+         * actually destroyed before the function returns so we would
+         * be returning a dangling pointer. No simple fix available, hence
+         * we use the ugly hack.
+         */
+        //return code().message().c_str();
+#define QUOTE_ARG(arg) #arg
+        return "future_error, see " __FILE__ ":" QUOTE_ARG(__LINE__);
     }
 }

uspace/lib/ui/test/window.c

@@ -787 +787 @@
         PCUT_ASSERT_NOT_NULL(window);
 
-        kbd_event.type = POS_PRESS;
+        kbd_event.type = KEY_PRESS;
         kbd_event.key = KC_X;
         kbd_event.mods = 0;

uspace/lib/usbdev/include/usb/dev/device.h

@@ -91 +91 @@
 
 usb_address_t usb_device_get_address(const usb_device_t *);
-usb_speed_t usb_device_get_depth(const usb_device_t *);
+unsigned usb_device_get_depth(const usb_device_t *);
 usb_speed_t usb_device_get_speed(const usb_device_t *);
 int usb_device_get_iface_number(const usb_device_t *);

uspace/srv/hid/output/proto/vt100.c

@@ -41 +41 @@
 #include "vt100.h"
 
-#define MAX_CONTROL  20
+/** Buffer size when creating actual VT100 commands.
+ *
+ * This is absurdly large but since we accept numbers via sysarg_t,
+ * we make it big enough for the largest value to be on the safe side
+ * (and to silence compiler too).
+ *
+ * TODO: find out if VT100 has some hard limits or perhaps simply cut-out
+ * values larger than 16 bits or something.
+ */
+#define MAX_CONTROL 64
 
 typedef enum {