<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/simtrace2/+/25703">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Use osmo_libusb_{init,exit}() instead of libusb_{init,exit}()<br><br>We use other osmo_libusb_* functions later in the code, so it is best<br>to initialize the library via libosmousb, and not directly.<br><br>Change-Id: I2fd981935e1420e529f5dd8a98edd347c317284c<br>---<br>M host/src/simtrace2-cardem-pcsc.c<br>M host/src/simtrace2-sniff.c<br>M host/src/simtrace2-tool.c<br>M host/src/simtrace2_usb.c<br>4 files changed, 6 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/03/25703/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/host/src/simtrace2-cardem-pcsc.c b/host/src/simtrace2-cardem-pcsc.c</span><br><span>index 8e143ba..510a371 100644</span><br><span>--- a/host/src/simtrace2-cardem-pcsc.c</span><br><span>+++ b/host/src/simtrace2-cardem-pcsc.c</span><br><span>@@ -633,7 +633,7 @@</span><br><span>        if (transp->usb_devh)</span><br><span>             libusb_close(transp->usb_devh);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  libusb_exit(NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+    osmo_libusb_exit(NULL);</span><br><span> do_exit:</span><br><span>  return ret;</span><br><span> }</span><br><span>diff --git a/host/src/simtrace2-sniff.c b/host/src/simtrace2-sniff.c</span><br><span>index c44029a..653508d 100644</span><br><span>--- a/host/src/simtrace2-sniff.c</span><br><span>+++ b/host/src/simtrace2-sniff.c</span><br><span>@@ -379,7 +379,7 @@</span><br><span>  }</span><br><span> </span><br><span>        /* Scan for available SIMtrace USB devices supporting sniffing */</span><br><span style="color: hsl(0, 100%, 40%);">-       rc = libusb_init(NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+       rc = osmo_libusb_init(NULL);</span><br><span>         if (rc < 0) {</span><br><span>             fprintf(stderr, "libusb initialization failed\n");</span><br><span>                 goto do_exit;</span><br><span>@@ -505,7 +505,7 @@</span><br><span>                  sleep(1);</span><br><span>    } while (keep_running);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     libusb_exit(NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+    osmo_libusb_exit(NULL);</span><br><span> do_exit:</span><br><span>  return ret;</span><br><span> }</span><br><span>diff --git a/host/src/simtrace2-tool.c b/host/src/simtrace2-tool.c</span><br><span>index 658f84a..f1423b0 100644</span><br><span>--- a/host/src/simtrace2-tool.c</span><br><span>+++ b/host/src/simtrace2-tool.c</span><br><span>@@ -265,7 +265,7 @@</span><br><span> </span><br><span>  transp->udp_fd = -1;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     rc = libusb_init(NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+       rc = osmo_libusb_init(NULL);</span><br><span>         if (rc < 0) {</span><br><span>             fprintf(stderr, "libusb initialization failed\n");</span><br><span>                 goto do_exit;</span><br><span>@@ -326,7 +326,7 @@</span><br><span>                  libusb_close(transp->usb_devh);</span><br><span>   } while (0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        libusb_exit(NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+    osmo_libusb_exit(NULL);</span><br><span> do_exit:</span><br><span>  return ret;</span><br><span> }</span><br><span>diff --git a/host/src/simtrace2_usb.c b/host/src/simtrace2_usb.c</span><br><span>index 8fa41fc..be1ba6e 100644</span><br><span>--- a/host/src/simtrace2_usb.c</span><br><span>+++ b/host/src/simtrace2_usb.c</span><br><span>@@ -77,7 +77,7 @@</span><br><span> </span><br><span> int main(int argc, char **argv)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-   libusb_init(NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+    osmo_libusb_init(NULL);</span><br><span>      find_devices();</span><br><span>      return 0;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/simtrace2/+/25703">change 25703</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/simtrace2/+/25703"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: simtrace2 </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I2fd981935e1420e529f5dd8a98edd347c317284c </div>
<div style="display:none"> Gerrit-Change-Number: 25703 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>