diff options
author | Marcus Meissner <marcus@jet.franken.de> | 2014-04-11 20:15:34 +0000 |
---|---|---|
committer | Marcus Meissner <marcus@jet.franken.de> | 2014-04-11 20:15:34 +0000 |
commit | 7318557c352d818da699bc5328756c233c9c1060 (patch) | |
tree | cf2f2b41b0eceb2b1c56679c259871b976003ab5 /camlibs/topfield/usb_io.c | |
parent | 73861f12036b5dfb912ca0214e6f574a0161c023 (diff) | |
download | libgphoto2-7318557c352d818da699bc5328756c233c9c1060.tar.gz |
iFrom: "Daniel P. Berrange" <dan@berrange.com>
Many calls of gp_port_* functions are passing a 'unsigned char *'
rather than the 'char *' they expect. Add explicit casts to
silence the compiler.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14899 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/topfield/usb_io.c')
-rw-r--r-- | camlibs/topfield/usb_io.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/camlibs/topfield/usb_io.c b/camlibs/topfield/usb_io.c index 3b3cec438..127c57bf1 100644 --- a/camlibs/topfield/usb_io.c +++ b/camlibs/topfield/usb_io.c @@ -91,13 +91,13 @@ static const unsigned char success_packet[8] = { ssize_t send_cancel(Camera *camera,GPContext *context) { gp_log (GP_LOG_DEBUG, "topfield", __func__); - return gp_port_write (camera->port, cancel_packet, 8); + return gp_port_write (camera->port, (char *)cancel_packet, 8); } ssize_t send_success(Camera *camera, GPContext *context) { gp_log (GP_LOG_DEBUG, "topfield", __func__); - return gp_port_write (camera->port, success_packet, 8); + return gp_port_write (camera->port, (char *)success_packet, 8); } ssize_t send_cmd_ready(Camera *camera, GPContext *context) @@ -269,7 +269,7 @@ ssize_t send_tf_packet(Camera *camera, struct tf_packet *packet, GPContext *cont gp_log (GP_LOG_DEBUG, "topfield", __func__); put_u16(&packet->crc, get_crc(packet)); swap_out_packet(packet); - return gp_port_write (camera->port, (unsigned char *) packet, byte_count); + return gp_port_write (camera->port, (char *) packet, byte_count); } /* Receive a Topfield protocol packet. @@ -281,7 +281,7 @@ ssize_t get_tf_packet(Camera *camera, struct tf_packet * packet, GPContext *cont int r; gp_log (GP_LOG_DEBUG, "topfield", __func__); - r = gp_port_read (camera->port, buf, MAXIMUM_PACKET_SIZE); + r = gp_port_read (camera->port, (char *)buf, MAXIMUM_PACKET_SIZE); if(r < 0) return r; |