projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bb78137
)
Change main() to have only one exit code flow, used also on errors
author
Joel Holdsworth
<joel@airwebreathe.org.uk>
Fri, 2 Nov 2012 00:11:21 +0000
(
00:11
+0000)
committer
Joel Holdsworth
<joel@airwebreathe.org.uk>
Fri, 2 Nov 2012 00:11:21 +0000
(
00:11
+0000)
main.cpp
patch
|
blob
|
history
diff --git
a/main.cpp
b/main.cpp
index b7ba5d8994e79c3d5fea053a2d59802ee378d16c..56b4dd5f1a4ed12c08bf2037061a48ad9ac7264d 100644
(file)
--- a/
main.cpp
+++ b/
main.cpp
@@
-47,6
+47,7
@@
void usage()
int main(int argc, char *argv[])
{
int main(int argc, char *argv[])
{
+ int ret = 0;
QApplication a(argc, argv);
// Set some application metadata
QApplication a(argc, argv);
// Set some application metadata
@@
-87,33
+88,38
@@
int main(int argc, char *argv[])
}
// Initialise libsigrokdecode
}
// 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(*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();
return ret;
sr_exit();
return ret;