diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2014-04-11 20:18:36 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2014-04-11 20:18:36 +0000 |
| commit | 292d2f69aa9846a2d24dafb0263828e8806f34c7 (patch) | |
| tree | 16d2b6363518b107fb1c0f30f2fd1376aaa24ea1 /camlibs/sierra | |
| parent | 7318557c352d818da699bc5328756c233c9c1060 (diff) | |
| download | libgphoto2-292d2f69aa9846a2d24dafb0263828e8806f34c7.tar.gz | |
From: "Daniel P. Berrange" <dan@berrange.com>
Many calls of gp_file_* 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@14900 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/sierra')
| -rw-r--r-- | camlibs/sierra/library.c | 4 | ||||
| -rw-r--r-- | camlibs/sierra/sierra.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/camlibs/sierra/library.c b/camlibs/sierra/library.c index 9b430ef88..317582451 100644 --- a/camlibs/sierra/library.c +++ b/camlibs/sierra/library.c @@ -1289,7 +1289,7 @@ int sierra_get_string_register (Camera *camera, int reg, int fnumber, *b_len += packlength; if (file) { - CHECK (gp_file_append (file, &p[4], packlength)); + CHECK (gp_file_append (file, (char *)&p[4], packlength)); if (total > min_progress_bytes) gp_context_progress_update (context, id, *b_len); } @@ -1431,7 +1431,7 @@ sierra_capture (Camera *camera, CameraCaptureType type, int sierra_upload_file (Camera *camera, CameraFile *file, GPContext *context) { const char *data; - long data_size; + long unsigned int data_size; /* Put the "magic spell" in register 32 */ CHECK (sierra_set_int_register (camera, 32, 0x0FEC000E, context)); diff --git a/camlibs/sierra/sierra.c b/camlibs/sierra/sierra.c index 4ce86a335..b6ade2cc5 100644 --- a/camlibs/sierra/sierra.c +++ b/camlibs/sierra/sierra.c @@ -537,7 +537,7 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename, char *jpeg_data = NULL; int jpeg_size; const char *data, *mime_type; - long int size; + long unsigned int size; int download_size, audio_info[8], transferred; /* @@ -752,7 +752,7 @@ put_file_func (CameraFilesystem * fs, const char *folder, const char *filename, char *picture_folder; int ret; const char *data_file; - long data_size; + long unsigned int data_size; int available_memory; GP_DEBUG ("*** put_file_func"); |