From 292d2f69aa9846a2d24dafb0263828e8806f34c7 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 11 Apr 2014 20:18:36 +0000 Subject: From: "Daniel P. Berrange" 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 --- camlibs/dimera/dimera3500.c | 8 ++++---- camlibs/directory/directory.c | 4 ++-- camlibs/fuji/library.c | 2 +- camlibs/kodak/dc120/library.c | 10 +++++----- camlibs/kodak/dc210/library.c | 4 ++-- camlibs/kodak/dc3200/dc3200.c | 2 +- camlibs/panasonic/dc1580.c | 2 +- camlibs/pccam300/library.c | 4 ++-- camlibs/pccam600/library.c | 6 +++--- camlibs/polaroid/pdc320.c | 2 +- camlibs/polaroid/pdc700.c | 8 ++++---- camlibs/samsung/samsung.c | 2 +- camlibs/sierra/library.c | 4 ++-- camlibs/sierra/sierra.c | 4 ++-- camlibs/smal/smal.c | 2 +- camlibs/sonydscf1/sonydscf1.c | 6 +++--- camlibs/soundvision/soundvision.c | 4 ++-- camlibs/spca50x/library.c | 2 +- camlibs/stv0674/library.c | 2 +- camlibs/stv0680/library.c | 6 +++--- camlibs/toshiba/pdrm11/pdrm11.c | 2 +- 21 files changed, 43 insertions(+), 43 deletions(-) (limited to 'camlibs') diff --git a/camlibs/dimera/dimera3500.c b/camlibs/dimera/dimera3500.c index 3700cfd51..e788f98a5 100644 --- a/camlibs/dimera/dimera3500.c +++ b/camlibs/dimera/dimera3500.c @@ -296,7 +296,7 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename, newdata = malloc(size*3); if (!newdata) return (GP_ERROR_NO_MEMORY); conversion_chuck (width, height, data, newdata); - gp_file_append (file, newdata, size*3); + gp_file_append (file, (char *)newdata, size*3); free (newdata); free (data); break; @@ -307,7 +307,7 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename, context); if (!data) return GP_ERROR; - gp_file_set_data_and_size (file, data, size); /* will take over data ptr ownership */ + gp_file_set_data_and_size (file, (char *)data, size); /* will take over data ptr ownership */ gp_file_set_mime_type (file, GP_MIME_RAW); gp_file_adjust_name_for_mime_type (file); break; @@ -315,7 +315,7 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename, data = Dimera_Get_Thumbnail (num, &size, camera); if (!data) return GP_ERROR; - gp_file_set_data_and_size (file, data, size); /* will take over data ptr ownership */ + gp_file_set_data_and_size (file, (char *)data, size); /* will take over data ptr ownership */ gp_file_set_mime_type (file, GP_MIME_PGM); gp_file_adjust_name_for_mime_type (file); break; @@ -397,7 +397,7 @@ static int camera_capture_preview(Camera *camera, CameraFile *file, GPContext *c data = Dimera_Preview( &size, camera, context); if (!data) return GP_ERROR; - return gp_file_set_data_and_size (file, data, size); + return gp_file_set_data_and_size (file, (char *)data, size); } static int camera_summary (Camera *camera, CameraText *summary, GPContext *context) { diff --git a/camlibs/directory/directory.c b/camlibs/directory/directory.c index cd4216c29..9ec95ad9f 100644 --- a/camlibs/directory/directory.c +++ b/camlibs/directory/directory.c @@ -553,7 +553,7 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename, } exif_data_save_data (data, &buf, &buf_len); exif_data_unref (data); - gp_file_set_data_and_size (file, buf, buf_len); + gp_file_set_data_and_size (file, (char *)buf, buf_len); return (GP_OK); #endif /* HAVE_LIBEXIF */ default: @@ -587,7 +587,7 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename, break; } curread += ret; - gp_file_append (file, buf, ret); + gp_file_append (file, (char *)buf, ret); gp_context_progress_update (context, id, (1.0*curread/BLOCKSIZE)); gp_context_idle (context); if (gp_context_cancel (context) == GP_CONTEXT_FEEDBACK_CANCEL) { diff --git a/camlibs/fuji/library.c b/camlibs/fuji/library.c index 101adb600..eb0fdd6e3 100644 --- a/camlibs/fuji/library.c +++ b/camlibs/fuji/library.c @@ -219,7 +219,7 @@ get_file_func (CameraFilesystem *fs, const char *folder, default: return (GP_ERROR_NOT_SUPPORTED); } - CR (gp_file_set_data_and_size (file, d, size)); + CR (gp_file_set_data_and_size (file, (char *)d, size)); CR (gp_file_set_mime_type (file, GP_MIME_JPEG)); return (GP_OK); diff --git a/camlibs/kodak/dc120/library.c b/camlibs/kodak/dc120/library.c index 93dcc878a..5c8fb3cc9 100644 --- a/camlibs/kodak/dc120/library.c +++ b/camlibs/kodak/dc120/library.c @@ -288,7 +288,7 @@ int dc120_get_status (Camera *camera, Kodak_dc120_status *status, GPContext *con if( retval == (GP_OK) && status != NULL ) { const char *data; - long int lsize; + long unsigned int lsize; gp_file_get_data_and_size( file, &data, &lsize ); if( lsize<122 ) { @@ -361,7 +361,7 @@ int dc120_get_albums (Camera *camera, int from_card, CameraList *list, GPContext char *f; char *p = dc120_packet_new(0x44); const char *file_data; - long int file_size; + long unsigned int file_size; if (from_card) p[1] = 0x01; @@ -396,7 +396,7 @@ int dc120_get_filenames (Camera *camera, int from_card, int album_number, Camera char *p; char buf[16]; const char *file_data; - long int file_size; + long unsigned int file_size; /* --- now read the files --- */ @@ -443,7 +443,7 @@ static int dc120_get_file_preview (Camera *camera, CameraFile *file, int file_nu int x; char buf[16]; const char *f_data; - long int f_size; + long unsigned int f_size; *size = 15680; @@ -473,7 +473,7 @@ static int dc120_get_file (Camera *camera, CameraFile *file, int file_number, ch CameraFile *size_file; /* file used to determine the filesize */ char *p; const char *file_data; - long int file_size; + long unsigned int file_size; int offset; /* --- first read the file size --- */ diff --git a/camlibs/kodak/dc210/library.c b/camlibs/kodak/dc210/library.c index a2477200e..1d71ff415 100644 --- a/camlibs/kodak/dc210/library.c +++ b/camlibs/kodak/dc210/library.c @@ -464,9 +464,9 @@ static int dc210_read_to_file }; /* append to file */ if (packets == blocks - 1 && remaining) - gp_file_append(f, b, remaining); + gp_file_append(f, (char *)b, remaining); else - gp_file_append(f, b, blocksize); + gp_file_append(f, (char *)b, blocksize); /* request next packet */ dc210_write_single_char(camera, DC210_CORRECT_PACKET); packet_following = dc210_wait_for_response(camera, 0, NULL); diff --git a/camlibs/kodak/dc3200/dc3200.c b/camlibs/kodak/dc3200/dc3200.c index c0995dfc4..e9c91cd22 100644 --- a/camlibs/kodak/dc3200/dc3200.c +++ b/camlibs/kodak/dc3200/dc3200.c @@ -358,7 +358,7 @@ static int get_file_func (CameraFilesystem *fs, const char *folder, return GP_ERROR; } - gp_file_append (file, data, data_len); + gp_file_append (file, (char *)data, data_len); free(data); camera->pl->context = NULL; diff --git a/camlibs/panasonic/dc1580.c b/camlibs/panasonic/dc1580.c index 36e16efa9..4ab63e528 100644 --- a/camlibs/panasonic/dc1580.c +++ b/camlibs/panasonic/dc1580.c @@ -561,7 +561,7 @@ static int put_file_func (CameraFilesystem *fs, const char *folder, const char * Camera *camera = user_data; int blocks, blocksize, i, result; const char *data; - long int size; + long unsigned int size; unsigned int id; gp_context_status(context, _("Uploading image: %s."), name); diff --git a/camlibs/pccam300/library.c b/camlibs/pccam300/library.c index aaff9c1b0..05484d3a6 100644 --- a/camlibs/pccam300/library.c +++ b/camlibs/pccam300/library.c @@ -151,7 +151,7 @@ file_list_func (CameraFilesystem *fs, const char *folder, } if (file) - gp_file_set_data_and_size (file, buffer, size); + gp_file_set_data_and_size (file, (char *)buffer, size); else free (buffer); @@ -197,7 +197,7 @@ get_file_func (CameraFilesystem *fs, const char *folder, default: return GP_ERROR_NOT_SUPPORTED; } - return gp_file_set_data_and_size (file, data, size); + return gp_file_set_data_and_size (file, (char *)data, size); } static int diff --git a/camlibs/pccam600/library.c b/camlibs/pccam600/library.c index 78ea79aba..cc3b4bb03 100644 --- a/camlibs/pccam600/library.c +++ b/camlibs/pccam600/library.c @@ -160,14 +160,14 @@ static int file_list_func (CameraFilesystem *fs, const char *folder, info.file.fields = GP_FILE_INFO_WIDTH | GP_FILE_INFO_HEIGHT | GP_FILE_INFO_TYPE; strcpy(info.file.type, GP_MIME_RAW); } - gp_filesystem_append(fs,folder,file_entry->name,context); + gp_filesystem_append(fs,folder,(char *)file_entry->name,context); info.preview.fields = 0; info.file.size = (file_entry->size[1]*256+ file_entry->size[0]) * 256; info.file.permissions = GP_FILE_PERM_READ | GP_FILE_PERM_DELETE; info.file.fields |= GP_FILE_INFO_SIZE | GP_FILE_INFO_PERMISSIONS |GP_FILE_INFO_TYPE; - CHECK(gp_filesystem_set_info_noop(fs, folder, file_entry->name, info, context)); + CHECK(gp_filesystem_set_info_noop(fs, folder, (char *)file_entry->name, info, context)); } } offset = 0; @@ -227,7 +227,7 @@ static int get_file_func (CameraFilesystem *fs, const char *folder, default: return GP_ERROR_NOT_SUPPORTED; } - return gp_file_set_data_and_size(file, data, size); + return gp_file_set_data_and_size(file, (char *)data, size); } static int camera_summary(Camera *camera, CameraText *summary, GPContext *context) diff --git a/camlibs/polaroid/pdc320.c b/camlibs/polaroid/pdc320.c index 88fff44cc..698876c5e 100644 --- a/camlibs/polaroid/pdc320.c +++ b/camlibs/polaroid/pdc320.c @@ -416,7 +416,7 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename, /* Post-processing */ switch (type) { case GP_FILE_TYPE_RAW: - CR (gp_file_set_data_and_size (file, data, size)); + CR (gp_file_set_data_and_size (file, (char *)data, size)); CR (gp_file_set_mime_type (file, GP_MIME_RAW)); break; case GP_FILE_TYPE_NORMAL: diff --git a/camlibs/polaroid/pdc700.c b/camlibs/polaroid/pdc700.c index 41670048a..84d6ee412 100644 --- a/camlibs/polaroid/pdc700.c +++ b/camlibs/polaroid/pdc700.c @@ -866,7 +866,7 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename, case GP_FILE_TYPE_NORMAL: /* Files are always JPEG */ - CRF (gp_file_set_data_and_size (file, data, size), data); + CRF (gp_file_set_data_and_size (file, (char *)data, size), data); CR (gp_file_set_mime_type (file, GP_MIME_JPEG)); break; @@ -880,7 +880,7 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename, (data[size - 2] == 0xff) && (data[size - 1] == 0xd9)) { /* Image is JPEG */ - CRF (gp_file_set_data_and_size (file, data, size), + CRF (gp_file_set_data_and_size (file, (char *)data, size), data); CR (gp_file_set_mime_type (file, GP_MIME_JPEG)); @@ -907,7 +907,7 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename, free (data); CRF (gp_file_append (file, header, strlen (header)), ppm); - CRF (gp_file_append (file, ppm, ppm_size), ppm); + CRF (gp_file_append (file, (char *)ppm, ppm_size), ppm); free (ppm); CR (gp_file_set_mime_type (file, GP_MIME_PPM)); @@ -923,7 +923,7 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename, case GP_FILE_TYPE_RAW: #if 1 - CRF (gp_file_set_data_and_size (file, data, size), data); + CRF (gp_file_set_data_and_size (file, (char *)data, size), data); CR (gp_file_set_mime_type (file, GP_MIME_RAW)); break; #endif diff --git a/camlibs/samsung/samsung.c b/camlibs/samsung/samsung.c index 7fc2c648b..8fcd30388 100644 --- a/camlibs/samsung/samsung.c +++ b/camlibs/samsung/samsung.c @@ -222,7 +222,7 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename, break; if (result < 0) return result; - gp_file_append(file,buffer,SDSC_BLOCKSIZE); + gp_file_append(file,(char *)buffer,SDSC_BLOCKSIZE); curread += SDSC_BLOCKSIZE; gp_context_progress_update(context, pid, curread); if (gp_context_cancel(context) == GP_CONTEXT_FEEDBACK_CANCEL) 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"); diff --git a/camlibs/smal/smal.c b/camlibs/smal/smal.c index e97ab04e3..41a575fd7 100644 --- a/camlibs/smal/smal.c +++ b/camlibs/smal/smal.c @@ -128,7 +128,7 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename, if (result < 0) return result; - CHECK_RESULT(gp_file_set_data_and_size (file, data, size)); + CHECK_RESULT(gp_file_set_data_and_size (file, (char *)data, size)); return (GP_OK); } diff --git a/camlibs/sonydscf1/sonydscf1.c b/camlibs/sonydscf1/sonydscf1.c index bcc3acd5b..1cad76e7c 100644 --- a/camlibs/sonydscf1/sonydscf1.c +++ b/camlibs/sonydscf1/sonydscf1.c @@ -239,7 +239,7 @@ get_file(GPPort *port, char *name, CameraFile *file, int format, GPContext *cont return GP_ERROR_IO_READ; } jpegcommentlen = make_jpeg_comment(buf, jpeg_comment); - ret = gp_file_append (file, jpeg_comment, jpegcommentlen); + ret = gp_file_append (file, (char *)jpeg_comment, jpegcommentlen); if (ret < GP_OK) return ret; total = 126; @@ -250,7 +250,7 @@ get_file(GPPort *port, char *name, CameraFile *file, int format, GPContext *cont if(len < 0) return GP_ERROR_IO_READ; total = total + len; - gp_file_append (file, buf, len); + gp_file_append (file, (char *)buf, len); gp_context_progress_update (context, id, total); if (gp_context_cancel (context) == GP_CONTEXT_FEEDBACK_CANCEL) { ret = GP_ERROR_CANCEL; @@ -302,7 +302,7 @@ get_thumbnail(GPPort *port,char *name, CameraFile *file, int format, int n) filelen = buf[12] * 0x1000000 + buf[13] * 0x10000 + buf[14] * 0x100 + buf[15]; - return gp_file_append (file, &buf[256], filelen); + return gp_file_append (file, (char *)&buf[256], filelen); } #if 0 diff --git a/camlibs/soundvision/soundvision.c b/camlibs/soundvision/soundvision.c index 45b6e9063..c2d1aca4e 100644 --- a/camlibs/soundvision/soundvision.c +++ b/camlibs/soundvision/soundvision.c @@ -282,7 +282,7 @@ static int get_file_func (CameraFilesystem *fs, const char *folder, if (!data) return GP_ERROR; - gp_file_set_data_and_size (file, data, size); + gp_file_set_data_and_size (file, (char *)data, size); /* Maybe skip below if EXIF data present? */ /* As far as I know we only support JPG and MOV */ @@ -385,7 +385,7 @@ static int put_file_func (CameraFilesystem *fs, const char *folder, const char * Camera *camera=data; const char *data_file; - long data_size; + long unsigned int data_size; /* * Upload the file to the camera. Use gp_file_get_data_and_size, etc. diff --git a/camlibs/spca50x/library.c b/camlibs/spca50x/library.c index 3d69e0bfb..31a993b19 100644 --- a/camlibs/spca50x/library.c +++ b/camlibs/spca50x/library.c @@ -409,7 +409,7 @@ get_file_func (CameraFilesystem *fs, const char *folder, } if (!data) return GP_ERROR; - return gp_file_set_data_and_size (file, data, size); + return gp_file_set_data_and_size (file, (char *)data, size); } static int diff --git a/camlibs/stv0674/library.c b/camlibs/stv0674/library.c index d61edd7ab..1c3001b02 100644 --- a/camlibs/stv0674/library.c +++ b/camlibs/stv0674/library.c @@ -189,7 +189,7 @@ int stv0674_get_image(GPPort *port, int image_no, CameraFile *file) } - gp_file_append(file, data, size); + gp_file_append(file, (char *)data, size); free(data); ret = gp_port_usb_msg_write (port, CMDID_FINISH_READ, 0, 0, (char *)imagno, 4); diff --git a/camlibs/stv0680/library.c b/camlibs/stv0680/library.c index 692b86939..086eacb14 100644 --- a/camlibs/stv0680/library.c +++ b/camlibs/stv0680/library.c @@ -221,7 +221,7 @@ int stv0680_get_image_raw(GPPort *port, int image_no, CameraFile *file) data = malloc(size * 3); gp_bayer_decode(raw,w,h,data,BAYER_TILE_GBRG_INTERLACED); free(raw); - gp_file_append(file, data, size*3); + gp_file_append(file, (char *)data, size*3); free(data); return GP_OK; } @@ -282,7 +282,7 @@ int stv0680_get_image(GPPort *port, int image_no, CameraFile *file) free(tmpdata2); free(tmpdata1); free(raw); - gp_file_append(file, data, 3*size); + gp_file_append(file, (char *)data, 3*size); free(data); return GP_OK; } @@ -339,7 +339,7 @@ int stv0680_get_image_preview(GPPort *port, int image_no, CameraFile *file) else bayer_unshuffle_preview(rw, rh, scale, raw, data); free(raw); - gp_file_append(file, data, size*3); + gp_file_append(file, (char *)data, size*3); free(data); return GP_OK; } diff --git a/camlibs/toshiba/pdrm11/pdrm11.c b/camlibs/toshiba/pdrm11/pdrm11.c index 94f000b8d..d28abd8a6 100644 --- a/camlibs/toshiba/pdrm11/pdrm11.c +++ b/camlibs/toshiba/pdrm11/pdrm11.c @@ -224,7 +224,7 @@ int pdrm11_get_file(CameraFilesystem *fs, const char *filename, CameraFileType t gp_file_set_mime_type(file, GP_MIME_JPEG); - gp_file_set_data_and_size(file, image, size); + gp_file_set_data_and_size(file, (char *)image, size); return(GP_OK); } -- cgit v1.2.1