Drop EOL blanks, // comments, and corrects some warnings

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

4 files changed, 19 insertions, 19 deletions

diff --git a/camlibs/sonydscf1/chotplay.c b/camlibs/sonydscf1/chotplay.c
index 3522e46ac..09bc781dd 100644
--- a/camlibs/sonydscf1/chotplay.c
+++ b/camlibs/sonydscf1/chotplay.c
@@ -265,7 +265,7 @@ long get_file(char *name, char **data, int format, int verbose)
   u_char buf[0x400];
   u_char jpeg_comment[256];
 
-  //verbose=1;
+  /* verbose=1; */
   F1ok();
 
   F1status(0);
@@ -276,7 +276,7 @@ long get_file(char *name, char **data, int format, int verbose)
 
   if(F1fopen(name) != 0)
     return(0);
-  //printf("camfile: %s\n",name);
+  /* printf("camfile: %s\n",name); */
   if(format == JPEG){
     len = F1fread(buf, 126);
     if( len < 126){
@@ -296,7 +296,7 @@ long get_file(char *name, char **data, int format, int verbose)
     if(len < 0)
       return(0);
     total = total + len;
-//    gp_camera_progress(camera, ((float)total / (float)filelen));
+/* gp_camera_progress(camera, ((float)total / (float)filelen)); */
     if(verbose){
       fprintf(stderr, "%6lu/", total);
       fprintf(stderr, "%6lu", filelen);
@@ -324,7 +324,7 @@ long get_thumbnail(char *name, char **data, int format, int verbose, int n)
   u_char buf[0x1000];
   u_char *p;
   char *ptr;
-  //printf("name %s,%d\n",name,n);
+  /* printf("name %s,%d\n",name,n); */
   p = buf;
 
   F1ok();
@@ -366,7 +366,7 @@ long get_thumbnail(char *name, char **data, int format, int verbose, int n)
   *data=ptr;
   ptr = memcpy(ptr,&buf[256],filelen);
 
-  //write_file(&buf[256], (int) filelen, fp);
+  /* write_file(&buf[256], (int) filelen, fp); */
   return(total);
 }
 
@@ -491,7 +491,7 @@ retry:
   else
     sprintf(name2, "/PIC_CAM/PIC00000/PSN%05d.PMP", picture_index[n]);
 
-  //printf("name %s, name2 %s, %d\n",name,name2,n);
+  /* printf("name %s, name2 %s, %d\n",name,name2,n); */
 
   if(verbose)
     switch(format){
diff --git a/camlibs/sonydscf1/command.c b/camlibs/sonydscf1/command.c
index 1e51ad63f..761bafe08 100644
--- a/camlibs/sonydscf1/command.c
+++ b/camlibs/sonydscf1/command.c
@@ -38,20 +38,20 @@ void wbyte(u_char c)
   dprintf((stderr, "> %02x\n", c));
   temp[0]=c;
   temp[1]='\0';
-  //if (writetty(F1fd, &c, 1) < 0) {
+  /* if (writetty(F1fd, &c, 1) < 0) { */
   if( gp_port_write(dev, (char*)temp, 1) <0) {
     perror("wbyte");
-    //Exit(1);
+    /* Exit(1); */
   }
 }
 
 u_char rbyte()
 {
   u_char        c[2];
-  //if (readtty(F1fd, &c, 1) < 0) {
+  /* if (readtty(F1fd, &c, 1) < 0) { */
   if (gp_port_read(dev,c, 1) <0) {
     perror("rbtyte");
-    //Exit(1);
+    /* Exit(1); */
   }
   dprintf((stderr, "< %02x\n", c));
 
@@ -62,10 +62,10 @@ inline void
 wstr(u_char *p, int len)
 {
   dprintf((stderr, "> len=%d\n", len));
-  //if (writetty(F1fd, p, len) < 0) {
+  /* if (writetty(F1fd, p, len) < 0) { */
   if( gp_port_write(dev, p, len) <0) {
     perror("wstr");
-    //Exit(1);
+    /* Exit(1); */
   }
 }
 
@@ -73,10 +73,10 @@ inline void rstr(u_char *p, int len)
 {
 
   dprintf((stderr, "< len=%d\n", len));
-  //if (readtty(F1fd, p, len) < 0) {
+  /* if (readtty(F1fd, p, len) < 0) { */
   if (gp_port_read(dev,p, len) <0) {
     perror("rstr");
-    //Exit(1);
+    /* Exit(1); */
   }
 }
 
@@ -396,7 +396,7 @@ long F1fseek(long offset, int base)
   return(buf[2]);
 }
 
-long F1fwrite(u_char *data, long len, u_char b) /* this function not work well  */
+long F1fwrite(u_char *data, long len, u_char b) /* this function not work well */
 {
 
   long i = 0;
@@ -583,9 +583,9 @@ int F1reset()
 void Exit(code)
      int code;
 {
-  /*if (!(F1getfd() < 0)){
+  /* if (!(F1getfd() < 0)){
     F1reset();
     closetty(F1getfd());
   } */
-  //exit(code);
+  /* exit(code); */
 }
diff --git a/camlibs/sonydscf1/dsc_f1.c b/camlibs/sonydscf1/dsc_f1.c
index 8d2837781..1e52f5f62 100644
--- a/camlibs/sonydscf1/dsc_f1.c
+++ b/camlibs/sonydscf1/dsc_f1.c
@@ -69,7 +69,7 @@ int dsc_f1_open_cam () {
   }
 
   if (devpath) {
-//    daemonuid();
+/* daemonuid(); */
     F1setfd(opentty(devpath));
   }
   if (F1getfd() < 0)
diff --git a/camlibs/sonydscf1/sonydscf1.c b/camlibs/sonydscf1/sonydscf1.c
index e7ca7e79b..bb31927ab 100644
--- a/camlibs/sonydscf1/sonydscf1.c
+++ b/camlibs/sonydscf1/sonydscf1.c
@@ -34,7 +34,7 @@ int camera_id (CameraText *id) {
 
 int camera_abilities (CameraAbilitiesList *list) {
 
-        //*count = 1;
+        /* *count = 1; */
         CameraAbilities a;
 
         /* Fill in each camera model's abilities */