struct interface_error *error;
int i, len = 0;
int *datalen = NULL;
- char *dest;
+ char *dest, *d_subsys, *d_code;
if (n_data) {
len = n_data * sizeof(char *);
}
}
- error = calloc(1, sizeof(*error) + sizeof(char *) + len);
+ error = calloc_a(sizeof(*error) + sizeof(char *) + len,
+ &d_subsys, subsystem ? strlen(subsystem) + 1 : 0,
+ &d_code, code ? strlen(code) + 1 : 0);
if (!error)
return;
list_add_tail(&error->list, &iface->errors);
- error->subsystem = subsystem;
- error->code = code;
dest = (char *) &error->data[n_data + 1];
for (i = 0; i < n_data; i++) {
memcpy(dest, data[i], datalen[i]);
dest += datalen[i];
}
- error->data[n_data] = NULL;
+ error->data[n_data++] = NULL;
+
+ if (subsystem)
+ error->subsystem = strcpy(d_subsys, subsystem);
+
+ if (code)
+ error->code = strcpy(d_code, code);
}
static void
void
__interface_set_down(struct interface *iface, bool force)
{
- interface_clear_errors(iface);
-
if (iface->state == IFS_DOWN ||
iface->state == IFS_TEARDOWN)
return;