From: "Daniel P. Berrange" <dan@berrange.com>

Many callers of strcpy/scanf/strcmp 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@14901 67ed7778-7388-44ab-90cf-0a291f65f57c

2 files changed, 11 insertions, 11 deletions

diff --git a/camlibs/sonydscf1/command.c b/camlibs/sonydscf1/command.c
index ce7799a1a..d37e0886c 100644
--- a/camlibs/sonydscf1/command.c
+++ b/camlibs/sonydscf1/command.c
@@ -229,7 +229,7 @@ int F1fopen(GPPort *port, char *name)
   buf[1] = 0x0A;
   buf[2] = 0x00;
   buf[3] = 0x00;
-  snprintf(&buf[4], sizeof(buf)-4, "%s", name);
+  snprintf((char*)&buf[4], sizeof(buf)-4, "%s", name);
   len = strlen(name) + 5;
   sendcommand(port,buf, len);
   recvdata(port, buf, 6);
@@ -404,7 +404,7 @@ unsigned long F1finfo(GPPort *port,char *name)
 
   buf[0] = 0x02;
   buf[1] = 0x0F;
-  snprintf(&buf[2], sizeof(buf)-2, "%s", name);
+  snprintf((char*)&buf[2], sizeof(buf)-2, "%s", name);
   len = strlen(name) + 3;
 
   sendcommand(port,buf, len);
@@ -487,7 +487,7 @@ int F1ok(GPPort*port)
 
   buf[0] = 0x01;
   buf[1] = 0x01;
-  sprintf(&buf[2],"SONY     MKY-1001         1.00");
+  sprintf((char*)&buf[2],"SONY     MKY-1001         1.00");
 
   while(retrycount--){
     sendcommand(port,buf, 32);
diff --git a/camlibs/sonydscf1/sonydscf1.c b/camlibs/sonydscf1/sonydscf1.c
index 1cad76e7c..3c880a326 100644
--- a/camlibs/sonydscf1/sonydscf1.c
+++ b/camlibs/sonydscf1/sonydscf1.c
@@ -78,7 +78,7 @@ make_jpeg_comment(unsigned char *buf, unsigned char *jpeg_comment)
   i = 0;
   while (1) {
     if ((reso == reso_tab[i].reso_val) || (reso_tab[i].reso_val == 0)) {
-      cur = 6 + sprintf(&jpeg_comment[6], "Resolution: %s\n",
+      cur = 6 + sprintf((char*)&jpeg_comment[6], "Resolution: %s\n",
                           reso_tab[i].reso_conv);
       break;
     }
@@ -92,7 +92,7 @@ make_jpeg_comment(unsigned char *buf, unsigned char *jpeg_comment)
   while (1) {
     if ((shutter == sh_speed_tab[i].spd_val) ||
         (sh_speed_tab[i].spd_val == 0)) {
-      cur = cur + sprintf(&jpeg_comment[cur], "Shutter-speed: %s\n",
+      cur = cur + sprintf((char*)&jpeg_comment[cur], "Shutter-speed: %s\n",
                           sh_speed_tab[i].spd_conv);
       break;
     }
@@ -101,17 +101,17 @@ make_jpeg_comment(unsigned char *buf, unsigned char *jpeg_comment)
 
   /* PMP comment */
   if (*(buf+PMP_COMMENT)) {
-    cur = cur + sprintf(&jpeg_comment[cur], "Comment: %s\n",
+    cur = cur + sprintf((char*)&jpeg_comment[cur], "Comment: %s\n",
                         (char *)(buf+PMP_COMMENT));
   }
 
   /* taken date */
   if (*(buf+PMP_TAKE_YEAR) == 0xff) {
-    cur = cur + sprintf(&jpeg_comment[cur],
+    cur = cur + sprintf((char*)&jpeg_comment[cur],
                         "Date-Taken: ----/--/-- --:--:--\n");
   }
   else {
-    cur = cur + sprintf(&jpeg_comment[cur],
+    cur = cur + sprintf((char*)&jpeg_comment[cur],
                         "Date-Taken: %d/%02d/%02d %02d:%02d:%02d\n",
     2000+(*(buf+PMP_TAKE_YEAR)), *(buf+PMP_TAKE_MONTH),
     *(buf+PMP_TAKE_DATE), *(buf+PMP_TAKE_HOUR), *(buf+PMP_TAKE_MINUTE),
@@ -120,11 +120,11 @@ make_jpeg_comment(unsigned char *buf, unsigned char *jpeg_comment)
 
   /* edited date */
   if (*(buf+PMP_EDIT_YEAR) == 0xff) {
-    cur = cur + sprintf(&jpeg_comment[cur],
+    cur = cur + sprintf((char*)&jpeg_comment[cur],
                         "Date-Edited: ----/--/-- --:--:--\n");
   }
   else {
-    cur = cur + sprintf(&jpeg_comment[cur],
+    cur = cur + sprintf((char*)&jpeg_comment[cur],
                         "Date-Edited: %d/%02d/%02d %02d:%02d:%02d\n",
     2000+(*(buf+PMP_EDIT_YEAR)), *(buf+PMP_EDIT_MONTH),
     *(buf+PMP_EDIT_DATE), *(buf+PMP_EDIT_HOUR), *(buf+PMP_EDIT_MINUTE),
@@ -133,7 +133,7 @@ make_jpeg_comment(unsigned char *buf, unsigned char *jpeg_comment)
 
   /* use flash? */
   if (*(buf+PMP_FLASH) != 0) {
-    cur = cur + sprintf(&jpeg_comment[cur], "Flash: on\n");
+    cur = cur + sprintf((char*)&jpeg_comment[cur], "Flash: on\n");
   }
 
   /* insert total jpeg comment length */