* demo/ccfa.c

	* demo/cfa.cpp
	* demo/thumb.cpp
	* demo/thumbc.c
	* testsuite/testsuite.cpp
	Remove some warnings with more strict compile options.

6 files changed, 52 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index f2c1de7..f59f288 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-02-23  Hubert Figuiere  <hub@figuiere.net>
+
+	* demo/ccfa.c
+	* demo/cfa.cpp
+	* demo/thumb.cpp
+	* demo/thumbc.c
+	* testsuite/testsuite.cpp
+	Remove some warnings with more strict compile options.
+
+=== 0.0.6 ===
+
 2009-02-21  Hubert Figuiere  <hub@figuiere.net>
 
 	* test/testunpack.cpp: 
diff --git a/demo/ccfa.c b/demo/ccfa.c
index deea0e0..08b8c4b 100644
--- a/demo/ccfa.c
+++ b/demo/ccfa.c
@@ -38,6 +38,7 @@ main(int argc, char** argv)
 	uint32_t options;
 	FILE *f;
 	int keepCompressed = 0;
+	size_t written_size;
 
 	if (argc < 2) {
 		fprintf(stderr, "missing parameter\n");
@@ -86,11 +87,18 @@ main(int argc, char** argv)
             p[i * 2]   = hi;
             p[i * 2 + 1] = lo;
         }
-		fwrite(buf, 1, size, f);
+		written_size = fwrite(buf, 1, size, f);
 		free(buf);
+		if(written_size != size) {
+			printf("short read\n");
+		}
     }
 	else {
-		fwrite(or_rawdata_data(rawdata), 1, or_rawdata_data_size(rawdata), f);
+		size_t size = or_rawdata_data_size(rawdata);
+		written_size = fwrite(or_rawdata_data(rawdata), 1, size, f);
+		if(written_size != size) {
+			printf("short read\n");
+		}
 	}
 	fclose(f);
 
diff --git a/demo/cfa.cpp b/demo/cfa.cpp
index c64a44d..83d9f0f 100644
--- a/demo/cfa.cpp
+++ b/demo/cfa.cpp
@@ -1,7 +1,7 @@
 /*
  * libopenraw - cfa.cpp
  *
- * Copyright (C) 2007 Hubert Figuiere
+ * Copyright (C) 2007, 2009 Hubert Figuiere
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -54,6 +54,7 @@ main(int argc, char** argv)
 	OpenRaw::init();
 	or_debug_set_level(DEBUG2);
 	FILE * f;
+	size_t written_size;
 
 	scoped_ptr<OpenRaw::RawFile> raw_file(OpenRaw::RawFile::newRawFile(argv[optind]));
 
@@ -87,12 +88,15 @@ main(int argc, char** argv)
             p[i * 2]   = hi;
             p[i * 2 + 1] = lo;
         }
-		fwrite(buf, 1, rdata.size(), f);
+		written_size = fwrite(buf, 1, rdata.size(), f);
 		free(buf);
     }
 	else {
-		fwrite(rdata.data(), 1, rdata.size(), f);
+		written_size = fwrite(rdata.data(), 1, rdata.size(), f);
 	}
+		if (written_size != rdata.size()) {
+			printf("short write\n");
+		}
 	fclose(f);
 	
 	return 0;
diff --git a/demo/thumb.cpp b/demo/thumb.cpp
index a77c972..8b22724 100644
--- a/demo/thumb.cpp
+++ b/demo/thumb.cpp
@@ -1,7 +1,7 @@
 /*
  * libopenraw - thumbcpp
  *
- * Copyright (C) 2006 Hubert Figuiere
+ * Copyright (C) 2006, 2009 Hubert Figuiere
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -65,11 +65,15 @@ main(int argc, char** argv)
 		scoped_ptr<Thumbnail> thumb(Thumbnail::getAndExtractThumbnail(argv[1],
 																	  160, err));
 		if (thumb != NULL) {
+			size_t s;
 			std::cerr << "thumb data size =" << thumb->size() << std::endl;
 			std::cerr << "thumb data type =" << thumb->dataType() << std::endl;
 			
 			f = fopen("thumb.jpg", "wb");
-			fwrite(thumb->data(), 1, thumb->size(), f);
+			s = fwrite(thumb->data(), 1, thumb->size(), f);
+			if(s != thumb->size()) {
+				std::cerr << "short write of " << s << " bytes\n";
+			}
 			fclose(f);
 		}
 		else {
@@ -82,11 +86,15 @@ main(int argc, char** argv)
 																	  640, err));
 		
 		if (thumb != NULL) {
+			size_t s;
 			std::cerr << "thumb data size =" << thumb->size() << std::endl;
 			std::cerr << "thumb data type =" << thumb->dataType() << std::endl;
 			
 			f = fopen("thumbl.jpg", "wb");
-			fwrite(thumb->data(), 1, thumb->size(), f);
+			s = fwrite(thumb->data(), 1, thumb->size(), f);
+			if(s != thumb->size()) {
+				std::cerr << "short write of " << s << " bytes\n";
+			}
 			fclose(f);
 		}
 		else {
@@ -98,11 +106,15 @@ main(int argc, char** argv)
 		scoped_ptr<Thumbnail> thumb(Thumbnail::getAndExtractThumbnail(argv[1],
 																	  2048, err));
 		if (thumb != NULL) {
+			size_t s;
 			std::cerr << "preview data size =" << thumb->size() << std::endl;
 			std::cerr << "preview data type =" << thumb->dataType() << std::endl;
 			
 			f = fopen("preview.jpg", "wb");
-			fwrite(thumb->data(), 1, thumb->size(), f);
+			s = fwrite(thumb->data(), 1, thumb->size(), f);
+			if(s != thumb->size()) {
+				std::cerr << "short write of " << s << " bytes\n";
+			}
 			fclose(f);
 		}
 		else {
diff --git a/demo/thumbc.c b/demo/thumbc.c
index 233b147..2ffabd4 100644
--- a/demo/thumbc.c
+++ b/demo/thumbc.c
@@ -58,6 +58,7 @@ main(int argc, char **argv)
 		void *thumbnailData;
 		or_data_type thumbnailFormat;
 		size_t dataSize;
+		size_t writtenSize;
 		FILE *output;
 		uint32_t x, y;
 		or_error err;
@@ -91,7 +92,10 @@ main(int argc, char **argv)
 				fprintf(output, "%u\n%u\n", x, y);
 				fprintf(output, "%d\n", 255);
 			}
-			fwrite(thumbnailData, dataSize, 1, output);
+			writtenSize = fwrite(thumbnailData, dataSize, 1, output);
+			if(writtenSize != dataSize) {
+				printf("short write\n");
+			}
 			fclose(output);
 			printf("output %u bytes in '%s'\n", dataSize, outfname);
 			err = or_thumbnail_release(thumbnail);
diff --git a/testsuite/testsuite.cpp b/testsuite/testsuite.cpp
index dbce5c1..402f7ba 100644
--- a/testsuite/testsuite.cpp
+++ b/testsuite/testsuite.cpp
@@ -1,7 +1,7 @@
 /*
  * libopenraw - testsuite.cpp
  *
- * Copyright (C) 2008 Hubert Figuiere
+ * Copyright (C) 2008-2009 Hubert Figuiere
  * Copyright (C) 2008 Novell, Inc.
  *
  * This library is free software: you can redistribute it and/or
@@ -812,8 +812,8 @@ int TestSuite::bootstrap(const std::string & overrides_file,
     return 0;
 }
 #else
-int TestSuite::bootstrap(const std::string & overrides_file,
-                         const std::string & download_dir)
+int TestSuite::bootstrap(const std::string & /*overrides_file*/,
+                         const std::string & /*download_dir*/)
 {
     return 1;
 }