From 0ff2ab615b0f11ede64fe307fcf1d84e11b157c9 Mon Sep 17 00:00:00 2001
From: Alfonso Gregory <83477269+AtariDreams@users.noreply.github.com>
Date: Mon, 30 Aug 2021 14:55:06 -0400
Subject: [PATCH] Sync improvements from downstream

---
 backend/usb-darwin.c | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/backend/usb-darwin.c b/backend/usb-darwin.c
index b17a9b382a..f0d04ab42c 100644
--- a/backend/usb-darwin.c
+++ b/backend/usb-darwin.c
@@ -1599,7 +1599,7 @@ static CFStringRef copy_printer_interface_deviceid(printer_interface_t printer,
 		/* This request takes the 0 based configuration index. IOKit returns a 1 based configuration index */
 		configurationIndex -= 1;
 
-		bzero(&request, sizeof(request));
+		memset(&request, 0, sizeof(request));
 
 		request.bmRequestType		= USBmakebmRequestType(kUSBIn, kUSBClass, kUSBInterface);
 		request.bRequest			= kUSBPrintClassGetDeviceID;
@@ -1641,7 +1641,7 @@ static CFStringRef copy_printer_interface_deviceid(printer_interface_t printer,
 		IOUSBDevRequestTO		request;
 		IOUSBDeviceDescriptor	desc;
 
-		bzero(&request, sizeof(request));
+		memset(&request, 0, sizeof(request));
 
 		request.bmRequestType = USBmakebmRequestType( kUSBIn,  kUSBStandard, kUSBDevice );
 		request.bRequest = kUSBRqGetDescriptor;
@@ -1704,13 +1704,8 @@ static CFStringRef copy_printer_interface_deviceid(printer_interface_t printer,
 			{
 				CFStringAppend(extras, ret);
 				CFRelease(ret);
-
-				ret = extras;
-			}
-			else
-			{
-				ret = extras;
 			}
+      ret = extras;
 		}
 	}
 
@@ -1754,7 +1749,7 @@ static CFStringRef copy_printer_interface_indexed_description(printer_interface_
 	UInt8 description[256]; // Max possible descriptor length
 	IOUSBDevRequestTO	request;
 
-	bzero(description, 2);
+	memset(description, 0, 2);
 
 	request.bmRequestType = USBmakebmRequestType(kUSBIn, kUSBStandard, kUSBDevice);
 	request.bRequest = kUSBRqGetDescriptor;
@@ -1768,7 +1763,7 @@ static CFStringRef copy_printer_interface_indexed_description(printer_interface_
 	err = (*printer)->ControlRequestTO(printer, 0, &request);
 	if (err != kIOReturnSuccess && err != kIOReturnOverrun)
 	{
-		bzero(description, request.wLength);
+		memset(description, 0, request.wLength);
 
 		// Let's try again full length. Here's why:
 		//      On USB 2.0 controllers, we will not get an overrun error.  We just get a "babble" error
@@ -1801,7 +1796,7 @@ static CFStringRef copy_printer_interface_indexed_description(printer_interface_
 	request.wValue = (kUSBStringDesc << 8) | index;
 	request.wIndex = language;
 
-	bzero(description, length);
+	memset(description, 0, length);
 	request.wLength = (UInt16)length;
 	request.pData = &description;
 	request.completionTimeout = 0;
-- 
2.47.2