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;
}
static int device_update_properties_bufs(sd_device *device) {
const char *val, *prop;
- char **buf_strv = NULL;
uint8_t *buf_nulstr = NULL;
- size_t allocated_nulstr = 0, allocated_strv = 0;
- size_t nulstr_len = 0, strv_size = 0;
+ size_t allocated_nulstr = 0;
+ size_t nulstr_len = 0, num = 0, i;
assert(device);
+ if (!device->properties_buf_outdated)
+ return 0;
+
FOREACH_DEVICE_PROPERTY(device, prop, val) {
size_t len = 0;
if (!buf_nulstr)
return -ENOMEM;
- buf_strv = GREEDY_REALLOC0(buf_strv, allocated_strv, strv_size + 2);
- if (!buf_strv)
- return -ENOMEM;
-
- buf_strv[++ strv_size] = (char *)&buf_nulstr[nulstr_len];
strscpyl((char *)buf_nulstr + nulstr_len, len + 1, prop, "=", val, NULL);
nulstr_len += len + 1;
+ ++num;
}
free(device->properties_nulstr);
- free(device->properties_strv);
device->properties_nulstr = buf_nulstr;
device->properties_nulstr_len = nulstr_len;
- device->properties_strv = buf_strv;
+
+ /* build strv from buf_nulstr */
+ free(device->properties_strv);
+ device->properties_strv = new0(char *, num + 1);
+ i = 0;
+ NULSTR_FOREACH(val, (char*) buf_nulstr) {
+ device->properties_strv[i] = (char *) val;
+ assert(i < num);
+ i++;
+ }
device->properties_buf_outdated = false;
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;
return 0;
}
+
+int device_read_db_force(sd_device *device) {
+ assert(device);
+
+ return device_read_db_aux(device, true);
+}