return 0;
}
-static int device_ammend(sd_device *device, const char *key, const char *value) {
+static int device_amend(sd_device *device, const char *key, const char *value) {
int r;
assert(device);
size_t l;
FOREACH_WORD(word, l, value, state) {
- char *devlink;
+ char devlink[l + 1];
- devlink = strndupa(word, l);
+ strncpy(devlink, word, l);
+ devlink[l] = '\0';
r = device_add_devlink(device, devlink);
if (r < 0)
size_t l;
FOREACH_WORD_SEPARATOR(word, l, value, ":", state) {
- char *tag;
+ char tag[l + 1];
- tag = strndupa(word, l);
+ (void)strncpy(tag, word, l);
+ tag[l] = '\0';
r = device_add_tag(device, tag);
if (r < 0)
return -EINVAL;
}
- r = device_ammend(device, key, value);
+ r = device_amend(device, key, value);
if (r < 0)
return r;
}
assert(device);
+ if (!device->properties_buf_outdated)
+ return 0;
+
FOREACH_DEVICE_PROPERTY(device, prop, val) {
size_t len = 0;
assert(nulstr);
assert(len);
- if (device->properties_buf_outdated) {
- r = device_update_properties_bufs(device);
- if (r < 0)
- return r;
- }
+ r = device_update_properties_bufs(device);
+ if (r < 0)
+ return r;
*nulstr = device->properties_nulstr;
*len = device->properties_nulstr_len;