int main(int argc, char *argv[])
{
+ int ret = 0;
+ struct sr_context *sr_ctx = NULL;
+
QApplication a(argc, argv);
// Set some application metadata
// Parse arguments
while (1) {
static const struct option long_options[] = {
- {"version", no_argument, 0, 'V'},
- {"help", no_argument, 0, 'h'},
+ {"version", no_argument, 0, 'V'},
+ {"help", no_argument, 0, 'h'},
{0, 0, 0, 0}
};
}
// Initialise libsigrok
- if (sr_init() != SR_OK) {
+ if (sr_init(&sr_ctx) != SR_OK) {
qDebug() << "ERROR: libsigrok init failed.";
return 1;
}
// Initialise libsigrokdecode
- if (srd_init(NULL) != SRD_OK) {
- qDebug() << "ERROR: libsigrokdecode init failed.";
- return 1;
- }
+ if (srd_init(NULL) == SRD_OK) {
+
+ // Load the protocol decoders
+ srd_decoder_load_all();
+
+ // Initialize all libsigrok drivers
+ sr_dev_driver **const drivers = sr_driver_list();
+ for (sr_dev_driver **driver = drivers; *driver; driver++) {
+ if (sr_driver_init(sr_ctx, *driver) != SR_OK) {
+ qDebug("Failed to initialize driver %s",
+ (*driver)->name);
+ ret = 1;
+ break;
+ }
+ }
- // Load the protocol decoders
- srd_decoder_load_all();
+ if (ret == 0) {
+ // Initialise the main window
+ pv::MainWindow w;
+ w.show();
- // Initialize all libsigrok drivers
- sr_dev_driver **const drivers = sr_driver_list();
- for (sr_dev_driver **driver = drivers; *driver; driver++) {
- if (sr_driver_init(*driver) != SR_OK) {
- qDebug("Failed to initialize driver %s",
- (*driver)->name);
- return 1;
+ // Run the application
+ ret = a.exec();
}
- }
- // Initialise the main window
- pv::MainWindow w;
- w.show();
+ // Destroy libsigrokdecode and libsigrok
+ srd_exit();
- // Run the application
- const int ret = a.exec();
+ } else {
+ qDebug() << "ERROR: libsigrokdecode init failed.";
+ }
- // Destroy libsigrokdecode and libsigrok
- srd_exit();
- sr_exit();
+ if (sr_ctx)
+ sr_exit(sr_ctx);
return ret;
}