X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=bindings%2Fcxx%2Fclasses.cpp;h=a5c9e4cdfa689a011c8ef1e445391d4b1b9b11b6;hb=2cb63065f525655d3abccc1b26edd7275937b034;hp=3298ce34d0cb1549f7420e8c2b8de547f67e792a;hpb=1b40fdb88108699cf9d912f3d7aadffb4dc04050;p=libsigrok.git

diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp
index 3298ce34..a5c9e4cd 100644
--- a/bindings/cxx/classes.cpp
+++ b/bindings/cxx/classes.cpp
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libsigrok/libsigrokcxx.hpp"
+#include "libsigrokcxx/libsigrokcxx.hpp"
 
 #include <sstream>
 #include <cmath>
@@ -1385,15 +1385,27 @@ string InputFormat::description()
 	return valid_string(sr_input_description_get(_structure));
 }
 
+vector<string> InputFormat::extensions()
+{
+	vector<string> exts;
+	for (const char *const *e = sr_input_extensions_get(_structure);
+		e && *e; e++)
+		exts.push_back(*e);
+	return exts;
+}
+
 map<string, shared_ptr<Option>> InputFormat::options()
 {
 	const struct sr_option **options = sr_input_options_get(_structure);
-	auto option_array = shared_ptr<const struct sr_option *>(
-		options, sr_input_options_free);
 	map<string, shared_ptr<Option>> result;
-	for (int i = 0; options[i]; i++)
-		result[options[i]->id] = shared_ptr<Option>(
-			new Option(options[i], option_array), Option::Deleter());
+	if (options)
+	{
+		auto option_array = shared_ptr<const struct sr_option *>(
+			options, sr_input_options_free);
+		for (int i = 0; options[i]; i++)
+			result[options[i]->id] = shared_ptr<Option>(
+				new Option(options[i], option_array), Option::Deleter());
+	}
 	return result;
 }
 
@@ -1522,15 +1534,27 @@ string OutputFormat::description()
 	return valid_string(sr_output_description_get(_structure));
 }
 
+vector<string> OutputFormat::extensions()
+{
+	vector<string> exts;
+	for (const char *const *e = sr_output_extensions_get(_structure);
+		e && *e; e++)
+		exts.push_back(*e);
+	return exts;
+}
+
 map<string, shared_ptr<Option>> OutputFormat::options()
 {
 	const struct sr_option **options = sr_output_options_get(_structure);
-	auto option_array = shared_ptr<const struct sr_option *>(
-		options, sr_output_options_free);
 	map<string, shared_ptr<Option>> result;
-	for (int i = 0; options[i]; i++)
-		result[options[i]->id] = shared_ptr<Option>(
-			new Option(options[i], option_array), Option::Deleter());
+	if (options)
+	{
+		auto option_array = shared_ptr<const struct sr_option *>(
+			options, sr_output_options_free);
+		for (int i = 0; options[i]; i++)
+			result[options[i]->id] = shared_ptr<Option>(
+				new Option(options[i], option_array), Option::Deleter());
+	}
 	return result;
 }