mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-01 12:46:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

st/prober: Minor clang-tidy fixes.

Browse source
This commit is contained in:
Ryan Pavlik 2019-08-16 17:01:18 -05:00
parent 80cc620eca
commit dddb8069d0
2 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/xrt/state_trackers/prober/p_prober.c
View file

@ -75,7 +75,7 @@ destroy(struct xrt_prober** xp);
*/ */
int int
xrt_prober_create_with_lists(struct xrt_prober** out_xp, xrt_prober_create_with_lists(struct xrt_prober** out_prober,
struct xrt_prober_entry_lists* lists) struct xrt_prober_entry_lists* lists)
{ {
struct prober* p = U_TYPED_CALLOC(struct prober); struct prober* p = U_TYPED_CALLOC(struct prober);
@ -86,7 +86,7 @@ xrt_prober_create_with_lists(struct xrt_prober** out_xp,
return ret; return ret;
} }
*out_xp = &p->base; *out_prober = &p->base;
return 0; return 0;
} }
@ -439,7 +439,6 @@ handle_found_device(struct prober* p,
P_ERROR(p, "Found more then one, HMD closing '%s'", xdev->name); P_ERROR(p, "Found more then one, HMD closing '%s'", xdev->name);
xdev->destroy(xdev); xdev->destroy(xdev);
return;
} }
static int static int

19
src/xrt/state_trackers/prober/p_udev.c
View file

@ -106,12 +106,12 @@ p_udev_get_usb_device_address_sysfs(struct udev_device* usb_dev,
static int static int
p_udev_get_sysattr_u16_base16(struct udev_device* dev, p_udev_get_sysattr_u16_base16(struct udev_device* dev,
const char* str, const char* name,
uint16_t* out_value); uint16_t* out_value);
static int static int
p_udev_get_sysattr_u32_base10(struct udev_device* dev, p_udev_get_sysattr_u32_base10(struct udev_device* dev,
const char* str, const char* name,
uint32_t* out_value); uint32_t* out_value);
XRT_MAYBE_UNUSED static void XRT_MAYBE_UNUSED static void
@ -139,7 +139,7 @@ p_udev_probe(struct prober* p)
p_udev_enumerate_hidraw(p, udev); p_udev_enumerate_hidraw(p, udev);
udev = udev_unref(udev); udev_unref(udev);
return 0; return 0;
} }
@ -220,7 +220,7 @@ p_udev_enumerate_usb(struct prober* p, struct udev* udev)
udev_device_unref(raw_dev); udev_device_unref(raw_dev);
} }
enumerate = udev_enumerate_unref(enumerate); udev_enumerate_unref(enumerate);
} }
static void static void
@ -321,7 +321,7 @@ p_udev_enumerate_v4l2(struct prober* p, struct udev* udev)
udev_device_unref(raw_dev); udev_device_unref(raw_dev);
} }
enumerate = udev_enumerate_unref(enumerate); udev_enumerate_unref(enumerate);
} }
static void static void
@ -439,7 +439,7 @@ p_udev_enumerate_hidraw(struct prober* p, struct udev* udev)
udev_device_unref(raw_dev); udev_device_unref(raw_dev);
} }
enumerate = udev_enumerate_unref(enumerate); udev_enumerate_unref(enumerate);
} }
static void static void
@ -449,7 +449,7 @@ p_udev_add_hidraw(struct prober_device* pdev,
{ {
size_t new_size = size_t new_size =
(pdev->num_hidraws + 1) * sizeof(struct prober_hidraw); (pdev->num_hidraws + 1) * sizeof(struct prober_hidraw);
pdev->hidraws = realloc(pdev->hidraws, new_size); pdev->hidraws = (struct prober_hidraw*)realloc(pdev->hidraws, new_size);
struct prober_hidraw* hidraw = &pdev->hidraws[pdev->num_hidraws++]; struct prober_hidraw* hidraw = &pdev->hidraws[pdev->num_hidraws++];
U_ZERO(hidraw); U_ZERO(hidraw);
@ -565,7 +565,7 @@ p_udev_get_and_parse_uevent(struct udev_device* raw_dev,
union { union {
uint8_t arr[8]; uint8_t arr[8];
uint64_t v; uint64_t v;
} extract = {0}; } extract = {{0}};
ret = sscanf(serial_utf8, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", ret = sscanf(serial_utf8, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx",
&extract.arr[5], &extract.arr[4], &extract.arr[3], &extract.arr[5], &extract.arr[4], &extract.arr[3],
@ -583,9 +583,8 @@ p_udev_get_and_parse_uevent(struct udev_device* raw_dev,
*out_product_id = product_id; *out_product_id = product_id;
*out_bluetooth_serial = bluetooth_serial; *out_bluetooth_serial = bluetooth_serial;
return 0; return 0;
} else {
return -1;
} }
return -1;
} }
static int static int