diff options
author | Marcus Meissner <marcus@jet.franken.de> | 2014-04-11 20:25:20 +0000 |
---|---|---|
committer | Marcus Meissner <marcus@jet.franken.de> | 2014-04-11 20:25:20 +0000 |
commit | 18c4ba9cc44f21f71334787d3d09a60cb49d2c66 (patch) | |
tree | 435a848a4f7b971de2d86c4dcf130c28d08508cb /camlibs/pccam600 | |
parent | 669d3bfc2fc7b1b8f8fbe4e97e1b51a37068b3ed (diff) | |
download | libgphoto2-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/pccam600')
-rw-r--r-- | camlibs/pccam600/library.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/camlibs/pccam600/library.c b/camlibs/pccam600/library.c index cc3b4bb03..94cd55e9b 100644 --- a/camlibs/pccam600/library.c +++ b/camlibs/pccam600/library.c @@ -121,7 +121,7 @@ static int file_list_func (CameraFilesystem *fs, const char *folder, } for (n = 0; n != nr_of_blocks; n++) { - CHECK(pccam600_read_data(camera->port, buffer)); + CHECK(pccam600_read_data(camera->port, (unsigned char *)buffer)); for (i = offset; i <= 512-32; i=i+32) { memcpy(file_entry,&(buffer)[i],32); @@ -130,7 +130,7 @@ static int file_list_func (CameraFilesystem *fs, const char *folder, !((file_entry->state & 0x08) == 8) ) { info.file.fields = 0; - temp = &(file_entry->name)[5]; + temp = (char *)&(file_entry->name)[5]; if (strncmp(temp,"JPG",3) == 0) { memcpy(&(file_entry->name)[5],".jpg",4); |