Slightly more consistent #include-guard naming.

[libsigrok.git] / hwplugin.c

diff --git a/hwplugin.c b/hwplugin.c
index c248476bd1d4321e054641736175c39a3edaf4ca..1ba4dbb0a623afc78fff2166130331bdd7790984 100644 (file)
--- a/hwplugin.c
+++ b/hwplugin.c
@@ -39,6 +39,7 @@ GSList *plugins;
 struct hwcap_option hwcap_options[] = {
        {HWCAP_SAMPLERATE, T_UINT64, "Sample rate", "samplerate"},
        {HWCAP_CAPTURE_RATIO, T_UINT64, "Pre-trigger capture ratio", "captureratio"},
+       {HWCAP_PATTERN_MODE, T_CHAR, "Pattern generator mode", "patternmode"},
        {0, 0, NULL, NULL},
 };
 
@@ -105,9 +106,9 @@ struct sigrok_device_instance *sigrok_device_instance_new(int index, int status,
        sdi->index = index;
        sdi->status = status;
        sdi->instance_type = -1;
-       sdi->vendor = strdup(vendor);
-       sdi->model = strdup(model);
-       sdi->version = strdup(version);
+       sdi->vendor = vendor ? strdup(vendor) : strdup("(unknown)");
+       sdi->model = model ? strdup(model) : NULL;
+       sdi->version = version ? strdup(version) : NULL;
        sdi->priv = NULL;
        sdi->usb = NULL;
 
@@ -167,7 +168,7 @@ struct usb_device_instance *usb_device_instance_new(uint8_t bus,
 
 void usb_device_instance_free(struct usb_device_instance *usb)
 {
-       /* QUICK HACK */
+       /* Avoid compiler warnings. */
        usb = usb;
 
        /* Nothing to do for this device instance type. */