X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fscpi%2Fscpi_vxi.c;h=b2324b71be96b70646122627ca9e43aec9a73cc5;hp=e4efbf1d1d55cab2f55eb4cf91b638a66cc6ed4a;hb=d40b8557a9625cccfb9bef99c77dd803bdd356e7;hpb=1a46cc62e2b528bcaeb1f8dc0c952a81b3bcba5c

diff --git a/src/scpi/scpi_vxi.c b/src/scpi/scpi_vxi.c
index e4efbf1d..b2324b71 100644
--- a/src/scpi/scpi_vxi.c
+++ b/src/scpi/scpi_vxi.c
@@ -20,12 +20,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "vxi.h"
 #include <rpc/rpc.h>
 #include <string.h>
-
-#include "vxi.h"
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
+#include "scpi.h"
 
 #define LOG_PREFIX "scpi_vxi"
 #define VXI_DEFAULT_TIMEOUT_MS 2000
@@ -66,7 +66,7 @@ static int scpi_vxi_open(void *priv)
 	Create_LinkResp *link_resp;
 
 	vxi->client = clnt_create(vxi->address, DEVICE_CORE, DEVICE_CORE_VERSION, "tcp");
-	if (vxi->client == NULL) {
+	if (!vxi->client) {
 		sr_err("Client creation failed for %s", vxi->address);
 		return SR_ERR;
 	}