changeset 11:9f62684e1911

Tidy + comment
author Chris Cannam
date Wed, 04 May 2016 10:26:14 +0100
parents c7baebf68fac
children 92e72014d979
files src/helper.cpp src/plugincandidates.cpp
diffstat 2 files changed, 15 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/src/helper.cpp	Tue May 03 15:42:09 2016 +0100
+++ b/src/helper.cpp	Wed May 04 10:26:14 2016 +0100
@@ -147,25 +147,24 @@
     string soname;
 
     if (argc != 2) {
-	cerr << "\nUsage:\n    " << argv[0] << " descriptorname\n"
-	    "\nwhere descriptorname is the name of a plugin descriptor symbol to be sought\n"
-	    "in each library (e.g. vampGetPluginDescriptor for Vamp plugins). The list of\n"
-	    "candidate plugin library filenames is read from stdin.\n" << endl;
-	return 2;
+        cerr << "\nUsage:\n    " << argv[0] << " descriptorname\n"
+            "\nwhere descriptorname is the name of a plugin descriptor symbol to be sought\n"
+            "in each library (e.g. vampGetPluginDescriptor for Vamp plugins). The list of\n"
+            "candidate plugin library filenames is read from stdin.\n" << endl;
+        return 2;
     }
 
     string descriptor = argv[1];
     
     while (getline(cin, soname)) {
-	string report = check(soname, descriptor);
-
-    if (report != "") {
-	    cout << "FAILURE|" << soname << "|" << report << endl;
-	    allGood = false;
-	} else {
-	    cout << "SUCCESS|" << soname << "|" << endl;
-	}
+        string report = check(soname, descriptor);
+        if (report != "") {
+            cout << "FAILURE|" << soname << "|" << report << endl;
+            allGood = false;
+        } else {
+            cout << "SUCCESS|" << soname << "|" << endl;
+        }
     }
-
+    
     return allGood ? 0 : 1;
 }
--- a/src/plugincandidates.cpp	Tue May 03 15:42:09 2016 +0100
+++ b/src/plugincandidates.cpp	Wed May 04 10:26:14 2016 +0100
@@ -94,6 +94,8 @@
 
 	for (unsigned int i = 0; i < dir.count(); ++i) {
             QString soname = dir.filePath(dir[i]);
+            // NB this means the library names passed to the helper
+            // are UTF-8 encoded
             candidates.push_back(soname.toStdString());
         }
     }