diff checker/plugincandidates.h @ 45:ad02dff8ebfb

Merge from branch errorcode
author Chris Cannam
date Fri, 31 Aug 2018 15:14:57 +0100
parents 40c6936c2fc9
children 81ce3ba92b16
line wrap: on
line diff
--- a/checker/plugincandidates.h	Wed Aug 29 12:06:56 2018 +0100
+++ b/checker/plugincandidates.h	Fri Aug 31 15:14:57 2018 +0100
@@ -1,6 +1,6 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
 /*
-    Copyright (c) 2016 Queen Mary, University of London
+    Copyright (c) 2016-2018 Queen Mary, University of London
 
     Permission is hereby granted, free of charge, to any person
     obtaining a copy of this software and associated documentation
@@ -34,6 +34,8 @@
 #include <vector>
 #include <map>
 
+#include "checkcode.h"
+
 /**
  * Class to identify and list candidate shared-library files possibly
  * containing plugins. Uses a separate process (the "helper", whose
@@ -81,9 +83,16 @@
      *  successfully during the scan for the given tag.
      */
     stringlist getCandidateLibrariesFor(std::string tag) const;
+    
+    struct FailureRec {
 
-    struct FailureRec {
+        /// Path of failed library file
         std::string library;
+
+        /// General class of failure
+        PluginCheckCode code;
+
+        /// Optional additional system-level message, already translated
         std::string message;
     };
 
@@ -99,6 +108,7 @@
     LogCallback *m_logCallback;
 
     stringlist getLibrariesInPath(stringlist path);
+    std::string getHelperCompatibilityVersion();
     stringlist runHelper(stringlist libraries, std::string descriptor);
     void recordResult(std::string tag, stringlist results);
     void log(std::string);