Skip to content

Commit cd21ad3

Browse files
gabebearshazron
authored andcommitted
Remove odd memory copy function (#380)
This seems to have been copied from https://stackoverflow.com/questions/9166291/converting-a-cfstringref-to-char
1 parent a15979f commit cd21ad3

File tree

1 file changed

+2
-18
lines changed

1 file changed

+2
-18
lines changed

src/ios-deploy/ios-deploy.m

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -314,23 +314,6 @@ device_desc get_device_desc(CFStringRef model) {
314314
return res;
315315
}
316316

317-
char * MYCFStringCopyUTF8String(CFStringRef aString) {
318-
if (aString == NULL) {
319-
return NULL;
320-
}
321-
322-
CFIndex length = CFStringGetLength(aString);
323-
CFIndex maxSize =
324-
CFStringGetMaximumSizeForEncoding(length,
325-
kCFStringEncodingUTF8);
326-
char *buffer = (char *)malloc(maxSize);
327-
if (CFStringGetCString(aString, buffer, maxSize,
328-
kCFStringEncodingUTF8)) {
329-
return buffer;
330-
}
331-
return NULL;
332-
}
333-
334317
CFStringRef get_device_full_name(const AMDeviceRef device) {
335318
CFStringRef full_name = NULL,
336319
device_udid = AMDeviceCopyDeviceIdentifier(device),
@@ -1540,7 +1523,8 @@ void handle_device(AMDeviceRef device) {
15401523
return;
15411524
}
15421525
} else {
1543-
device_id = MYCFStringCopyUTF8String(found_device_id);
1526+
// Use the first device we find if a device_id wasn't specified.
1527+
device_id = strdup(CFStringGetCStringPtr(found_device_id, kCFStringEncodingUTF8));
15441528
found_device = true;
15451529
}
15461530

0 commit comments

Comments
 (0)