Mirrors/avrdude
1
0
Fork 0
mirror of https://github.com/avrdudes/avrdude.git synced 2026-09-27 19:46:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove check for 'verbose' on call to pmsg_notice().

Browse Source 
Remove some unnecessary braces and parens.
This commit is contained in:
MikeRaffa
2023-12-06 20:03:31 -05:00
parent e351dc30b2
commit 5dbbb4e6c5
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/usbasp.c
View File

@@ -401,9 +401,7 @@ static int usbasp_transmit(const PROGRAMMER *pgm,
static int check_for_port_argument_match(const char *port, char *bus, char *device, char *serial_num) {
if (verbose) {
pmsg_notice("usbOpenDevice(): found USBasp, bus:device: %s:%s, serial_number: %s\n", bus, device, serial_num);
}
pmsg_notice("usbOpenDevice(): found USBasp, bus:device: %s:%s, serial_number: %s\n", bus, device, serial_num);
const size_t usb_len = strlen("usb");
if(str_starts(port, "usb") && ':' == port[usb_len]) {
port += usb_len + 1;
@@ -416,7 +414,7 @@ static int check_for_port_argument_match(const char *port, char *bus, char *devi
return str_eq(port, device);
}
// serial number case
return (*port && str_ends(serial_num, port));
return *port && str_ends(serial_num, port);
}
// Invalid -P option.
return 0;
@@ -493,9 +491,8 @@ static int usbOpenDevice(libusb_device_handle **device, int vendor, const char *
sprintf(bus_num, "%d", libusb_get_bus_number(dev));
char dev_addr[21];
sprintf(dev_addr, "%d", libusb_get_device_address(dev));
if (!check_for_port_argument_match(port, bus_num, dev_addr, string)) {
if (!check_for_port_argument_match(port, bus_num, dev_addr, string))
errorCode = USB_ERROR_NOTFOUND;
}
}
}
if (errorCode == 0)
@@ -573,9 +570,8 @@ static int didUsbInit = 0;
// -P option given
usb_get_string_simple(handle, dev->descriptor.iSerialNumber,
string, sizeof(string));
if (!check_for_port_argument_match(port, bus->dirname, dev->filename, string)) {
if (!check_for_port_argument_match(port, bus->dirname, dev->filename, string))
errorCode = USB_ERROR_NOTFOUND;
}
}
}
if (errorCode == 0)