summaryrefslogtreecommitdiff
path: root/camlibs/polaroid
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2014-04-11 20:25:20 +0000
committerMarcus Meissner <marcus@jet.franken.de>2014-04-11 20:25:20 +0000
commit18c4ba9cc44f21f71334787d3d09a60cb49d2c66 (patch)
tree435a848a4f7b971de2d86c4dcf130c28d08508cb /camlibs/polaroid
parent669d3bfc2fc7b1b8f8fbe4e97e1b51a37068b3ed (diff)
downloadlibgphoto2-18c4ba9cc44f21f71334787d3d09a60cb49d2c66.tar.gz
From: "Daniel P. Berrange" <dan@berrange.com>
Fixes to misc functions to address char * vs unsigned char * sign mis-matches, by adding casts to silence the compiler. git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14902 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/polaroid')
-rw-r--r--camlibs/polaroid/pdc320.c2
-rw-r--r--camlibs/polaroid/pdc700.c12
2 files changed, 7 insertions, 7 deletions
diff --git a/camlibs/polaroid/pdc320.c b/camlibs/polaroid/pdc320.c
index 698876c5e..062a2bde5 100644
--- a/camlibs/polaroid/pdc320.c
+++ b/camlibs/polaroid/pdc320.c
@@ -486,7 +486,7 @@ camera_summary (Camera *camera, CameraText *summary, GPContext *context)
char buf[12];
GP_DEBUG ("*** PDC320_ID ***");
- CR (pdc320_simple_command_reply (camera->port, PDC320_ID, 0, 12, buf));
+ CR (pdc320_simple_command_reply (camera->port, PDC320_ID, 0, 12, (unsigned char *)buf));
sprintf (summary->text, _("Model: %x, %x, %x, %x"), buf[8],buf[9],buf[10],buf[11]);
return (GP_OK);
}
diff --git a/camlibs/polaroid/pdc700.c b/camlibs/polaroid/pdc700.c
index 3c9bc5ded..3b1b33bec 100644
--- a/camlibs/polaroid/pdc700.c
+++ b/camlibs/polaroid/pdc700.c
@@ -392,7 +392,7 @@ pdc700_baud (Camera *camera, int baud, GPContext *context)
{
unsigned char cmd[6];
unsigned char buf[2048];
- int buf_len = 0;
+ unsigned int buf_len = 0;
cmd[3] = PDC700_BAUD;
switch (baud) {
@@ -422,7 +422,7 @@ pdc700_baud (Camera *camera, int baud, GPContext *context)
static int
pdc700_init (Camera *camera, GPContext *context)
{
- int buf_len = 0;
+ unsigned int buf_len = 0;
unsigned char cmd[5];
unsigned char buf[2048];
@@ -436,7 +436,7 @@ static int
pdc700_picinfo (Camera *camera, unsigned int n, PDCPicInfo *info,
GPContext *context)
{
- int buf_len = 0;
+ unsigned int buf_len = 0;
unsigned char cmd[7];
unsigned char buf[2048];
@@ -492,7 +492,7 @@ pdc700_config (Camera *camera, PDCConf conf, unsigned char value, GPContext *con
{
unsigned char cmd[12];
unsigned char buf[512];
- int buf_len = 0;
+ unsigned int buf_len = 0;
cmd[3] = PDC700_CONFIG;
cmd[4] = conf;
@@ -507,7 +507,7 @@ pdc700_config (Camera *camera, PDCConf conf, unsigned char value, GPContext *con
static int
pdc700_info (Camera *camera, PDCInfo *info, GPContext *context)
{
- int buf_len = 0;
+ unsigned int buf_len = 0;
unsigned char buf[2048];
unsigned char cmd[5];
@@ -623,7 +623,7 @@ pdc700_set_date (Camera *camera, time_t time, GPContext *context)
{
unsigned char cmd[15];
unsigned char buf[512];
- int buf_len = 0;
+ unsigned int buf_len = 0;
struct tm *tm;
PDCInfo info;