usbip: replace -100 returned values on error | failing by -1 values

While there is no convention about what a function should return, we can usually say that "-1" is used to signify something went wrong. This makes a lot more sense and it is more likely expected than returning "-100". Signed-off-by: Alexandre Demers <[email protected]>
xiaolou86 · Aug 3, 2019 · 8976383 · 8976383
1 parent c1e7bd3
commit 8976383
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/userspace/lib/usbip_stub.c b/userspace/lib/usbip_stub.c
@@ -204,7 +204,7 @@ walker_attach(HDEVINFO dev_info, PSP_DEVINFO_DATA pdev_info_data, devno_t devno,
 	if (devno == *pdevno) {
 		if (!apply_stub_fdo(dev_info, pdev_info_data))
 			return -2;
-		return -100;
+		return -1;
 	}
 	return 0;
 }
@@ -215,7 +215,7 @@ attach_stub_driver(devno_t devno)
 	int	ret;
 
 	ret = traverse_usbdevs(walker_attach, FALSE, &devno);
-	if (ret == -100)
+	if (ret == -1)
 		return TRUE;
 	return FALSE;
 }
@@ -228,7 +228,7 @@ walker_detach(HDEVINFO dev_info, PSP_DEVINFO_DATA pdev_info_data, devno_t devno,
 	if (devno == *pdevno) {
 		if (!rollback_driver(dev_info, pdev_info_data))
 			return -2;
-		return -100;
+		return -1;
 	}
 	return 0;
 }
@@ -239,7 +239,7 @@ detach_stub_driver(devno_t devno)
 	int	ret;
 
 	ret = traverse_usbdevs(walker_detach, FALSE, &devno);
-	if (ret == -100)
+	if (ret == -1)
 		return TRUE;
 	return FALSE;
 }
diff --git a/userspace/src/usbip/usbip_unbind.c b/userspace/src/usbip/usbip_unbind.c
@@ -40,7 +40,7 @@ walker_unbind(HDEVINFO dev_info, PSP_DEVINFO_DATA pdev_info_data, devno_t devno,
 		/* gotcha */
 		if (detach_stub_driver(devno)) {
 			restart_device(dev_info, pdev_info_data);
-			return -100;
+			return -1;
 		}
 	}
 	return 0;
@@ -54,7 +54,7 @@ static int unbind_device(char *busid)
 	devno = get_devno_from_busid(busid);
 
 	ret = traverse_usbdevs(walker_unbind, TRUE, (void *)&devno);
-	if (ret == -100) {
+	if (ret == -1) {
 		info("unbind device on busid %s: complete", busid);
 		return 0;
 	}

diff --git a/userspace/src/usbip/usbip_vhci.c b/userspace/src/usbip/usbip_vhci.c
@@ -32,16 +32,18 @@ walker_devpath(HDEVINFO dev_info, PSP_DEVINFO_DATA pdev_info_data, devno_t devno
 
 	*pdevpath = _strdup(pdev_interface_detail->DevicePath);
 	free(pdev_interface_detail);
-	return -100;
+	return -1;
 }
 
 static char *
 get_vhci_devpath(void)
 {
 	char	*devpath;
 
-	if (traverse_intfdevs(walker_devpath, &GUID_DEVINTERFACE_VHCI_USBIP, &devpath) != -100)
+	if (traverse_intfdevs(walker_devpath, &GUID_DEVINTERFACE_VHCI_USBIP, &devpath) != -1) {
 		return NULL;
+	}
+
 	return devpath;
 }
 

diff --git a/userspace/src/usbipd/usbipd_stub.c b/userspace/src/usbipd/usbipd_stub.c
@@ -41,7 +41,7 @@ walker_devpath(HDEVINFO dev_info, PSP_DEVINFO_DATA pdev_info_data, devno_t devno
 	}
 	pctx->devpath = _strdup(pdetail->DevicePath);
 	free(pdetail);
-	return -100;
+	return -1;
 }
 
 static char *
@@ -52,7 +52,7 @@ get_device_path(const char *id_inst)
 
 	devpath_ctx.id_inst = id_inst;
 	rc = traverse_intfdevs(walker_devpath, &GUID_DEVINTERFACE_STUB_USBIP, &devpath_ctx);
-	if (rc != -100) {
+	if (rc != -1) {
 		err("%s: traverse_intfdevs failed, returned: %d", __FUNCTION__, rc);
 		return NULL;
 	}
@@ -98,7 +98,7 @@ walker_get_id_inst(HDEVINFO dev_info, PSP_DEVINFO_DATA pdev_info_data, devno_t d
 
 	if (devno == pctx->devno) {
 		pctx->id_inst = get_id_inst(dev_info, pdev_info_data);
-		return -100;
+		return -1;
 	}
 	return 0;
 }
@@ -112,7 +112,7 @@ get_devpath_from_devno(devno_t devno)
 
 	ctx.devno = devno;
 	rc = traverse_usbdevs(walker_get_id_inst, TRUE, &ctx);
-	if (rc != -100) {
+	if (rc != -1) {
 		err("%s: traverse_usbdevs failed. traverse_usbdevs returned %d.", __FUNCTION__, rc);
 		return NULL;
 	}
@@ -182,4 +182,4 @@ open_stub_dev(devno_t devno)
 		return INVALID_HANDLE_VALUE;
 	}
 	return hdev;
-}
+}