- struct sr_dev_driver **driver_list = sr_driver_list(_structure);
- if (driver_list)
- for (int i = 0; driver_list[i]; i++)
- _drivers[driver_list[i]->name] =
- new Driver(driver_list[i]);
- const struct sr_input_module **input_list = sr_input_list();
- if (input_list)
- for (int i = 0; input_list[i]; i++)
- _input_formats[sr_input_id_get(input_list[i])] =
- new InputFormat(input_list[i]);
- const struct sr_output_module **output_list = sr_output_list();
- if (output_list)
- for (int i = 0; output_list[i]; i++)
- _output_formats[sr_output_id_get(output_list[i])] =
- new OutputFormat(output_list[i]);
+ if (struct sr_dev_driver **driver_list = sr_driver_list(_structure))
+ for (int i = 0; driver_list[i]; i++) {
+ unique_ptr<Driver> driver {new Driver{driver_list[i]}};
+ _drivers.insert(make_pair(driver->name(), move(driver)));
+ }
+
+ if (const struct sr_input_module **input_list = sr_input_list())
+ for (int i = 0; input_list[i]; i++) {
+ unique_ptr<InputFormat> input {new InputFormat{input_list[i]}};
+ _input_formats.insert(make_pair(input->name(), move(input)));
+ }
+
+ if (const struct sr_output_module **output_list = sr_output_list())
+ for (int i = 0; output_list[i]; i++) {
+ unique_ptr<OutputFormat> output {new OutputFormat{output_list[i]}};
+ _output_formats.insert(make_pair(output->name(), move(output)));
+ }