Fixed signedness warnings in clicksmart310, iclick, mars, and sonix camlibs

git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@10409 67ed7778-7388-44ab-90cf-0a291f65f57c

4 files changed, 17 insertions, 11 deletions

diff --git a/camlibs/iclick/ChangeLog b/camlibs/iclick/ChangeLog
index 1b4a5e2cf..46a73dfb2 100644
--- a/camlibs/iclick/ChangeLog
+++ b/camlibs/iclick/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-26  Theodore Kilgore <kilgota@auburn.edu>
+	* library.c: Fixed signedness errors
+	* iclick.c:   ditto
+	* iclick.h:   changed a return type from char* to int
+
 2004-11-29  Marcus Meissner  <marcus@jet.franken.de>
 
 	* .cvsignore: ignore stuff
diff --git a/camlibs/iclick/iclick.c b/camlibs/iclick/iclick.c
index 79f51b26b..78412e183 100644
--- a/camlibs/iclick/iclick.c
+++ b/camlibs/iclick/iclick.c
@@ -77,7 +77,7 @@ icl_init (GPPort *port, CameraPrivateLibrary *priv)
 	icl_reset (port);
 
 	icl_access_reg(port, CONFIG);	     /* Access config */
-	gp_port_read(port, catalog, 0x8000); 
+	gp_port_read(port, (char *)catalog, 0x8000); 
 	/* Config data is in lines of 16 bytes. Each photo uses two lines. */
 	icl_read_picture_data(port, dummy_buf, 0x28000);
 	icl_reset (port);
@@ -160,18 +160,18 @@ icl_reset (GPPort *port)
     	return GP_OK;
 }
 
-unsigned char *
+int 
 icl_read_picture_data (GPPort *port, unsigned char *data, int size )
 {
 	int remainder = size % 0x8000;
 	int offset = 0;
 
 	while ((offset + 0x8000) <= size) {
-		gp_port_read (port, data + offset, 0x8000);
+		gp_port_read (port, (char *)data + offset, 0x8000);
 		offset += 0x8000;
 	}
 	if (remainder)
-		gp_port_read (port, data + offset, remainder);
+		gp_port_read (port, (char *)data + offset, remainder);
 
     	return GP_OK;
 } 
diff --git a/camlibs/iclick/iclick.h b/camlibs/iclick/iclick.h
index 6d4f5fb08..039e92941 100644
--- a/camlibs/iclick/iclick.h
+++ b/camlibs/iclick/iclick.h
@@ -82,7 +82,7 @@ int icl_access_reg 		     (GPPort *, enum icl_cmnd_type);
 int icl_reset             		(GPPort *);
 int icl_rewind                        (GPPort *, CameraPrivateLibrary *);
 int icl_init                          (GPPort *, CameraPrivateLibrary *);
-unsigned char *icl_read_picture_data  (GPPort *, unsigned char *data, int size);
+int icl_read_picture_data  (GPPort *, unsigned char *data, int size);
 
 /* Those functions don't need data transfer with the camera */
 
diff --git a/camlibs/iclick/library.c b/camlibs/iclick/library.c
index 9fed8cc34..b6ad41a68 100644
--- a/camlibs/iclick/library.c
+++ b/camlibs/iclick/library.c
@@ -149,8 +149,8 @@ file_list_func (CameraFilesystem *fs, const char *folder, CameraList *list,
 
 	gp_list_reset (list);
 	for (i = 0; i < camera->pl->nb_entries; i++) {
-		snprintf(buf, sizeof(buf), "img%03i.ppm", i + 1);
-		gp_list_append (list, buf, NULL);
+		snprintf((char *)buf, sizeof(buf), "img%03i.ppm", i + 1);
+		gp_list_append (list, (char *)buf, NULL);
 	}
 
 	return GP_OK;
@@ -241,6 +241,7 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename,
 	framesize = datasize;
 
 	frame_data = malloc(datasize);
+	if (!frame_data) return GP_ERROR_NO_MEMORY;
 	icl_read_picture_data(camera->port, frame_data, datasize);
 	camera->pl->data_offset += datasize;
 
@@ -259,19 +260,19 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename,
 		gp_file_set_mime_type (file, GP_MIME_RAW);
 		gp_file_set_name (file, filename);
 		gp_file_adjust_name_for_mime_type (file);
-	        gp_file_set_data_and_size (file, frame_data, datasize);
+	        gp_file_set_data_and_size (file, (char *)frame_data, datasize);
 		return (GP_OK);
 	default:
 		return GP_ERROR_NOT_SUPPORTED; 
 	}
 
 	/* Write the frame(s) */
-	snprintf(buf, sizeof(buf),
+	snprintf((char *)buf, sizeof(buf),
 		"P6\n"
 		"# CREATOR: gphoto2, iClick library\n"
 		"%d %d\n"
 		"255\n", w, h);
-	hdrsize = strlen(buf);
+	hdrsize = strlen((char *)buf);
 
 	ppmsize = (hdrsize + w*h*3) * nb_frames;
 	GP_DEBUG ("ppmsize = %i\n", ppmsize);
@@ -296,7 +297,7 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename,
 
 	gp_file_set_mime_type (file, GP_MIME_PPM);
 	gp_file_set_name (file, filename);
-	gp_file_set_data_and_size (file, ppm, ppmsize);
+	gp_file_set_data_and_size (file, (char *)ppm, ppmsize);
 
 	free (frame_data);