summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Engraf <dogge2k@gmx.de>2008-07-16 09:16:38 -0500
committerDaniel Drake <dsd@gentoo.org>2008-07-16 09:16:38 -0500
commit66c9847ad54b126ccafd4877292454ab57d0c115 (patch)
tree5e0faf38bf06e6a9ef8e9e796301d064ae183e10
parent6494f07a6d1b73ce786ae581c4ff691e39e61d19 (diff)
downloadlibusb-66c9847ad54b126ccafd4877292454ab57d0c115.tar.gz
Linux: correct usage of MAX_PATH
Thanks to clarification from Artem Egorkine, MAX_PATH already includes space for the trailing NULL.
-rw-r--r--libusb/os/linux_usbfs.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libusb/os/linux_usbfs.c b/libusb/os/linux_usbfs.c
index 095a4ab..09cf685 100644
--- a/libusb/os/linux_usbfs.c
+++ b/libusb/os/linux_usbfs.c
@@ -202,7 +202,7 @@ static int usbfs_get_device_descriptor(struct libusb_device *dev,
static int __open_sysfs_attr(struct libusb_device *dev, const char *attr)
{
struct linux_device_priv *priv = __device_priv(dev);
- char filename[PATH_MAX + 1];
+ char filename[PATH_MAX];
int fd;
snprintf(filename, PATH_MAX, "%s/%s/%s",
@@ -484,7 +484,7 @@ static int get_config_descriptor(struct libusb_context *ctx, int fd,
static int op_get_config_descriptor(struct libusb_device *dev,
uint8_t config_index, unsigned char *buffer, size_t len, int *host_endian)
{
- char filename[PATH_MAX + 1];
+ char filename[PATH_MAX];
int fd;
int r;
@@ -590,7 +590,7 @@ static int initialize_device(struct libusb_device *dev, uint8_t busnum,
{
struct linux_device_priv *priv = __device_priv(dev);
unsigned char *dev_buf;
- char path[PATH_MAX + 1];
+ char path[PATH_MAX];
int fd;
int active_config = 0;
int device_configured = 1;
@@ -752,7 +752,7 @@ static int usbfs_scan_busdir(struct libusb_context *ctx,
struct discovered_devs **_discdevs, uint8_t busnum)
{
DIR *dir;
- char dirpath[PATH_MAX + 1];
+ char dirpath[PATH_MAX];
struct dirent *entry;
struct discovered_devs *discdevs = *_discdevs;
int r = 0;
@@ -835,7 +835,7 @@ static int sysfs_scan_device(struct libusb_context *ctx,
{
int r;
FILE *fd;
- char filename[PATH_MAX + 1];
+ char filename[PATH_MAX];
int busnum;
int devaddr;
@@ -962,7 +962,7 @@ static int op_get_device_list(struct libusb_context *ctx,
static int op_open(struct libusb_device_handle *handle)
{
struct linux_device_handle_priv *hpriv = __device_handle_priv(handle);
- char filename[PATH_MAX + 1];
+ char filename[PATH_MAX];
__get_usbfs_path(handle->dev, filename);
hpriv->fd = open(filename, O_RDWR);