output/csv: use intermediate time_t var, silence compiler warning

[libsigrok.git] / src / serial.c

diff --git a/src/serial.c b/src/serial.c
index c87c3a3347fc3a45ef4c2824a7e797ff692bf41e..d78dea20197d2f5a0ac52e3d44aaecb4c5a12e15 100644 (file)
--- a/src/serial.c
+++ b/src/serial.c
@@ -99,6 +99,8 @@ SR_PRIV int serial_open(struct sr_serial_dev_inst *serial, int flags)
                serial->lib_funcs = ser_lib_funcs_hid;
        else if (ser_name_is_bt(serial))
                serial->lib_funcs = ser_lib_funcs_bt;
+       else if (ser_name_is_tcpraw(serial))
+               serial->lib_funcs = ser_lib_funcs_tcpraw;
        else
                serial->lib_funcs = ser_lib_funcs_libsp;
        if (!serial->lib_funcs)
@@ -925,16 +927,25 @@ SR_PRIV int serial_stream_detect(struct sr_serial_dev_inst *serial,
        return SR_ERR;
 }
 
+#endif
+
 /**
  * Extract the serial device and options from the options linked list.
  *
- * @param options List of options passed from the command line.
- * @param serial_device Pointer where to store the extracted serial device.
- * @param serial_options Pointer where to store the optional extracted serial
+ * The caller's passed in references get updated when the list of options
+ * contains one of the desired parameters. This lets callers pre-assign
+ * default values which take effect in the absence of user specifications.
+ * Either reference is optional, passing #NULL is acceptable.
+ *
+ * Callers must not free returned strings. These shall be considered
+ * read-only handles to data that is managed elsewhere.
+ *
+ * @param[in] options List of options passed from the command line.
+ * @param[out] serial_device Pointer where to store the extracted serial device.
+ * @param[out] serial_options Pointer where to store the optional extracted serial
  * options.
  *
- * @return SR_OK if a serial_device is found, SR_ERR if no device is found. The
- * returned string should not be freed by the caller.
+ * @return SR_OK if a serial_device is found, SR_ERR if no device is found.
  *
  * @private
  */
@@ -944,23 +955,25 @@ SR_PRIV int sr_serial_extract_options(GSList *options,
        GSList *l;
        struct sr_config *src;
 
-       *serial_device = NULL;
-
        for (l = options; l; l = l->next) {
                src = l->data;
                switch (src->key) {
                case SR_CONF_CONN:
+                       if (!serial_device)
+                               break;
                        *serial_device = g_variant_get_string(src->data, NULL);
                        sr_dbg("Parsed serial device: %s.", *serial_device);
                        break;
                case SR_CONF_SERIALCOMM:
+                       if (!serial_options)
+                               break;
                        *serial_options = g_variant_get_string(src->data, NULL);
                        sr_dbg("Parsed serial options: %s.", *serial_options);
                        break;
                }
        }
 
-       if (!*serial_device) {
+       if (serial_device && !*serial_device) {
                sr_dbg("No serial device specified.");
                return SR_ERR;
        }
@@ -968,6 +981,8 @@ SR_PRIV int sr_serial_extract_options(GSList *options,
        return SR_OK;
 }
 
+#ifdef HAVE_SERIAL_COMM
+
 /** @private */
 SR_PRIV int serial_source_add(struct sr_session *session,
        struct sr_serial_dev_inst *serial, int events, int timeout,