RepoMirrors
/
simple-mtpfs
mirror of https://github.com/phatina/simple-mtpfs
1
0
Fork 0
Code Issues Releases Wiki Activity

use default usb context in smtpfs_raw_device_new()

This commit is contained in:
Peter Hatina 2014-02-09 19:18:20 +01:00
parent 5535446a7a
commit d4105f8fe0
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/simple-mtpfs-util.cpp
View File

@ -189,16 +189,14 @@ LIBMTP_raw_device_t *smtpfs_raw_device_new_priv(libusb_device *usb_device)
LIBMTP_raw_device_t *smtpfs_raw_device_new(const std::string &path) LIBMTP_raw_device_t *smtpfs_raw_device_new(const std::string &path)
{ {
libusb_context *ctx; if (libusb_init(NULL) != 0)
int err = libusb_init(&ctx);
if (err)
return nullptr; return nullptr;
std::string dev_path(smtpfs_realpath(path)); std::string dev_path(smtpfs_realpath(path));
libusb_device **dev_list; libusb_device **dev_list;
ssize_t num_devs = libusb_get_device_list(ctx, &dev_list); ssize_t num_devs = libusb_get_device_list(NULL, &dev_list);
if (num_devs < 1) { if (!num_devs) {
libusb_exit(ctx); libusb_exit(NULL);
return nullptr; return nullptr;
} }
@ -223,7 +221,7 @@ LIBMTP_raw_device_t *smtpfs_raw_device_new(const std::string &path)
LIBMTP_raw_device_t *raw_device = smtpfs_raw_device_new_priv(dev); LIBMTP_raw_device_t *raw_device = smtpfs_raw_device_new_priv(dev);
libusb_free_device_list(dev_list, 0); libusb_free_device_list(dev_list, 0);
libusb_exit(ctx); libusb_exit(NULL);
return raw_device; return raw_device;
} }