The branch, master has been updated
via 276750c1464b24cd334d483e9ccdab87d9673152 (commit)
from c2219c82ecb5731775fecec7f5348d62f578355b (commit)
- Log -----------------------------------------------------------------
commit 276750c1464b24cd334d483e9ccdab87d9673152
Author: Uwe Bonnes <bon@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Tue Sep 3 11:03:50 2013 +0200
libftdi_write_data: argument #2 should be const
Joerg Wunsch <j@xxxxxxxxxxxxxxxxx> noted that in libftdi_write_data() the
buffer that is sent is only accessed reeading and so should be const. Please
consider appended patch ( if I got "const unsigned char *" versus "unsigned
char const *" right).
-----------------------------------------------------------------------
Summary of changes:
src/ftdi.c | 4 ++--
src/ftdi.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/ftdi.c b/src/ftdi.c
index c19810b..8124985 100644
--- a/src/ftdi.c
+++ b/src/ftdi.c
@@ -1369,7 +1369,7 @@ int ftdi_set_line_property2(struct ftdi_context *ftdi,
enum ftdi_bits_type bits,
\retval <0: error code from usb_bulk_write()
\retval >0: number of bytes written
*/
-int ftdi_write_data(struct ftdi_context *ftdi, unsigned char *buf, int size)
+int ftdi_write_data(struct ftdi_context *ftdi, const unsigned char *buf, int
size)
{
int offset = 0;
int actual_length;
@@ -1384,7 +1384,7 @@ int ftdi_write_data(struct ftdi_context *ftdi, unsigned
char *buf, int size)
if (offset+write_size > size)
write_size = size-offset;
- if (libusb_bulk_transfer(ftdi->usb_dev, ftdi->in_ep, buf+offset,
write_size, &actual_length, ftdi->usb_write_timeout) < 0)
+ if (libusb_bulk_transfer(ftdi->usb_dev, ftdi->in_ep, (unsigned char
*)buf+offset, write_size, &actual_length, ftdi->usb_write_timeout) < 0)
ftdi_error_return(-1, "usb bulk write failed");
offset += actual_length;
diff --git a/src/ftdi.h b/src/ftdi.h
index 3d97dd9..a0ad8b4 100644
--- a/src/ftdi.h
+++ b/src/ftdi.h
@@ -502,7 +502,7 @@ extern "C"
int ftdi_read_data_set_chunksize(struct ftdi_context *ftdi, unsigned int
chunksize);
int ftdi_read_data_get_chunksize(struct ftdi_context *ftdi, unsigned int
*chunksize);
- int ftdi_write_data(struct ftdi_context *ftdi, unsigned char *buf, int
size);
+ int ftdi_write_data(struct ftdi_context *ftdi, const unsigned char *buf,
int size);
int ftdi_write_data_set_chunksize(struct ftdi_context *ftdi, unsigned int
chunksize);
int ftdi_write_data_get_chunksize(struct ftdi_context *ftdi, unsigned int
*chunksize);
hooks/post-receive
--
A library to talk to FTDI chips
--
libftdi-git - see http://www.intra2net.com/en/developer/libftdi for details.
To unsubscribe send a mail to libftdi-git+unsubscribe@xxxxxxxxxxxxxxxxxxxxxxx
|