RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-14 09:34:59 +00:00
Code Issues Activity Actions

Everywhere: Add sv suffix to strings relying on StringView(char const*)

Browse source 
Each of these strings would previously rely on StringView's char const*
constructor overload, which would call __builtin_strlen on the string.
Since we now have operator ""sv, we can replace these with much simpler
versions. This opens the door to being able to remove
StringView(char const*).

No functional changes.
This commit is contained in:
sin-ack 2022-07-11 17:32:29 +00:00 • committed by Andreas Kling
parent e5f09ea170
commit 3f3f45580a
762 changed files with 8315 additions and 8316 deletions
Download patch file Download diff file Expand all files Collapse all files

84
Userland/Utilities/lsusb.cpp
View file

@ -59,77 +59,77 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
json.as_array().for_each([usb_db, print_verbose](auto& value) {
auto& device_descriptor = value.as_object();
auto device_address = device_descriptor.get("device_address").to_u32();
auto vendor_id = device_descriptor.get("vendor_id").to_u32();
auto product_id = device_descriptor.get("product_id").to_u32();
auto device_address = device_descriptor.get("device_address"sv).to_u32();
auto vendor_id = device_descriptor.get("vendor_id"sv).to_u32();
auto product_id = device_descriptor.get("product_id"sv).to_u32();
StringView vendor_string = usb_db->get_vendor(vendor_id);
StringView device_string = usb_db->get_device(vendor_id, product_id);
if (device_string.is_empty())
device_string = "Unknown Device";
device_string = "Unknown Device"sv;
outln("Device {}: ID {:04x}:{:04x} {} {}", device_address, vendor_id, product_id, vendor_string, device_string);
if (print_verbose) {
outln("Device Descriptor");
outln(" bLength {}", device_descriptor.get("length").to_u32());
outln(" bDescriptorType {}", device_descriptor.get("descriptor_type").to_u32());
outln(" bcdUSB {}", device_descriptor.get("usb_spec_compliance_bcd").to_u32());
outln(" bDeviceClass {}", device_descriptor.get("device_class").to_u32());
outln(" bDeviceSubClass {}", device_descriptor.get("device_sub_class").to_u32());
outln(" bDeviceProtocol {}", device_descriptor.get("device_protocol").to_u32());
outln(" bMaxPacketSize {}", device_descriptor.get("max_packet_size").to_u32());
outln(" idVendor 0x{:04x} {}", device_descriptor.get("vendor_id").to_u32(), vendor_string);
outln(" idProduct 0x{:04x} {}", device_descriptor.get("product_id").to_u32(), device_string);
outln(" bcdDevice {}", device_descriptor.get("device_release_bcd").to_u32());
outln(" iManufacturer {}", device_descriptor.get("manufacturer_id_descriptor_index").to_u32());
outln(" iProduct {}", device_descriptor.get("product_string_descriptor_index").to_u32());
outln(" iSerial {}", device_descriptor.get("serial_number_descriptor_index").to_u32());
outln(" bNumConfigurations {}", device_descriptor.get("num_configurations").to_u32());
outln(" bLength {}", device_descriptor.get("length"sv).to_u32());
outln(" bDescriptorType {}", device_descriptor.get("descriptor_type"sv).to_u32());
outln(" bcdUSB {}", device_descriptor.get("usb_spec_compliance_bcd"sv).to_u32());
outln(" bDeviceClass {}", device_descriptor.get("device_class"sv).to_u32());
outln(" bDeviceSubClass {}", device_descriptor.get("device_sub_class"sv).to_u32());
outln(" bDeviceProtocol {}", device_descriptor.get("device_protocol"sv).to_u32());
outln(" bMaxPacketSize {}", device_descriptor.get("max_packet_size"sv).to_u32());
outln(" idVendor 0x{:04x} {}", device_descriptor.get("vendor_id"sv).to_u32(), vendor_string);
outln(" idProduct 0x{:04x} {}", device_descriptor.get("product_id"sv).to_u32(), device_string);
outln(" bcdDevice {}", device_descriptor.get("device_release_bcd"sv).to_u32());
outln(" iManufacturer {}", device_descriptor.get("manufacturer_id_descriptor_index"sv).to_u32());
outln(" iProduct {}", device_descriptor.get("product_string_descriptor_index"sv).to_u32());
outln(" iSerial {}", device_descriptor.get("serial_number_descriptor_index"sv).to_u32());
outln(" bNumConfigurations {}", device_descriptor.get("num_configurations"sv).to_u32());
auto const& configuration_descriptors = value.as_object().get("configurations");
auto const& configuration_descriptors = value.as_object().get("configurations"sv);
configuration_descriptors.as_array().for_each([&](auto& config_value) {
auto const& configuration_descriptor = config_value.as_object();
outln(" Configuration Descriptor:");
outln(" bLength {}", configuration_descriptor.get("length").as_u32());
outln(" bDescriptorType {}", configuration_descriptor.get("descriptor_type").as_u32());
outln(" wTotalLength {}", configuration_descriptor.get("total_length").as_u32());
outln(" bNumInterfaces {}", configuration_descriptor.get("number_of_interfaces").as_u32());
outln(" bmAttributes 0x{:02x}", configuration_descriptor.get("attributes_bitmap").as_u32());
outln(" MaxPower {}mA", configuration_descriptor.get("max_power").as_u32() * 2u);
outln(" bLength {}", configuration_descriptor.get("length"sv).as_u32());
outln(" bDescriptorType {}", configuration_descriptor.get("descriptor_type"sv).as_u32());
outln(" wTotalLength {}", configuration_descriptor.get("total_length"sv).as_u32());
outln(" bNumInterfaces {}", configuration_descriptor.get("number_of_interfaces"sv).as_u32());
outln(" bmAttributes 0x{:02x}", configuration_descriptor.get("attributes_bitmap"sv).as_u32());
outln(" MaxPower {}mA", configuration_descriptor.get("max_power"sv).as_u32() * 2u);
auto const& interface_descriptors = config_value.as_object().get("interfaces");
auto const& interface_descriptors = config_value.as_object().get("interfaces"sv);
interface_descriptors.as_array().for_each([&](auto& interface_value) {
auto const& interface_descriptor = interface_value.as_object();
auto const interface_class_code = interface_descriptor.get("interface_class_code").to_u32();
auto const interface_subclass_code = interface_descriptor.get("interface_sub_class_code").to_u32();
auto const interface_protocol_code = interface_descriptor.get("interface_protocol").to_u32();
auto const interface_class_code = interface_descriptor.get("interface_class_code"sv).to_u32();
auto const interface_subclass_code = interface_descriptor.get("interface_sub_class_code"sv).to_u32();
auto const interface_protocol_code = interface_descriptor.get("interface_protocol"sv).to_u32();
auto const interface_class = usb_db->get_class(interface_class_code);
auto const interface_subclass = usb_db->get_subclass(interface_class_code, interface_subclass_code);
auto const interface_protocol = usb_db->get_protocol(interface_class_code, interface_subclass_code, interface_protocol_code);
outln(" Interface Descriptor:");
outln(" bLength {}", interface_descriptor.get("length").to_u32());
outln(" bDescriptorType {}", interface_descriptor.get("descriptor_type").to_u32());
outln(" bInterfaceNumber {}", interface_descriptor.get("interface_number").to_u32());
outln(" bAlternateSetting {}", interface_descriptor.get("alternate_setting").to_u32());
outln(" bNumEndpoints {}", interface_descriptor.get("num_endpoints").to_u32());
outln(" bLength {}", interface_descriptor.get("length"sv).to_u32());
outln(" bDescriptorType {}", interface_descriptor.get("descriptor_type"sv).to_u32());
outln(" bInterfaceNumber {}", interface_descriptor.get("interface_number"sv).to_u32());
outln(" bAlternateSetting {}", interface_descriptor.get("alternate_setting"sv).to_u32());
outln(" bNumEndpoints {}", interface_descriptor.get("num_endpoints"sv).to_u32());
outln(" bInterfaceClass {} {}", interface_class_code, interface_class);
outln(" bInterfaceSubClass {} {}", interface_subclass_code, interface_subclass);
outln(" bInterfaceProtocol {} {}", interface_protocol_code, interface_protocol);
outln(" iInterface {}", interface_descriptor.get("interface_string_desc_index").to_u32());
outln(" iInterface {}", interface_descriptor.get("interface_string_desc_index"sv).to_u32());
auto const& endpoint_descriptors = interface_value.as_object().get("endpoints");
auto const& endpoint_descriptors = interface_value.as_object().get("endpoints"sv);
endpoint_descriptors.as_array().for_each([&](auto& endpoint_value) {
auto const& endpoint_descriptor = endpoint_value.as_object();
auto const endpoint_address = endpoint_descriptor.get("endpoint_address").to_u32();
auto const endpoint_address = endpoint_descriptor.get("endpoint_address"sv).to_u32();
outln(" Endpoint Descriptor:");
outln(" bLength {}", endpoint_descriptor.get("length").to_u32());
outln(" bDescriptorType {}", endpoint_descriptor.get("descriptor_type").to_u32());
outln(" bLength {}", endpoint_descriptor.get("length"sv).to_u32());
outln(" bDescriptorType {}", endpoint_descriptor.get("descriptor_type"sv).to_u32());
outln(" bEndpointAddress 0x{:02x} EP {} {}", endpoint_address, (endpoint_address & 0xFu), ((endpoint_address & 0x80u) ? "IN" : "OUT"));
outln(" bmAttributes 0x{:02x}", endpoint_descriptor.get("attribute_bitmap").to_u32());
outln(" wMaxPacketSize 0x{:04x}", endpoint_descriptor.get("max_packet_size").to_u32());
outln(" bInterval {}", endpoint_descriptor.get("polling_interval").to_u32());
outln(" bmAttributes 0x{:02x}", endpoint_descriptor.get("attribute_bitmap"sv).to_u32());
outln(" wMaxPacketSize 0x{:04x}", endpoint_descriptor.get("max_packet_size"sv).to_u32());
outln(" bInterval {}", endpoint_descriptor.get("polling_interval"sv).to_u32());
});
});
});