diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2007-11-16 23:35:21 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2007-11-16 23:35:21 +0000 |
| commit | 3419f905a95ccd40df08643de7ed2d67705e105c (patch) | |
| tree | d71aa25d706695afb837c23553cf2a8ffd2d3f6a /camlibs/sonydscf1 | |
| parent | 89b0fbb53c7fbe611c63c1b0daeaa19f16c21063 (diff) | |
| download | libgphoto2-3419f905a95ccd40df08643de7ed2d67705e105c.tar.gz | |
-verbose flag for stdout
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@10873 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/sonydscf1')
| -rw-r--r-- | camlibs/sonydscf1/command.c | 9 | ||||
| -rw-r--r-- | camlibs/sonydscf1/command.h | 2 | ||||
| -rw-r--r-- | camlibs/sonydscf1/sonydscf1.c | 2 |
3 files changed, 3 insertions, 10 deletions
diff --git a/camlibs/sonydscf1/command.c b/camlibs/sonydscf1/command.c index 700a89c56..d8fa59a8f 100644 --- a/camlibs/sonydscf1/command.c +++ b/camlibs/sonydscf1/command.c @@ -433,7 +433,7 @@ u_long F1finfo(GPPort *port,char *name) return(flen); } -long F1getdata(GPPort*port,char *name, u_char *data, int verbose) +long F1getdata(GPPort*port,char *name, u_char *data) { long filelen; long total = 0; @@ -456,15 +456,8 @@ long F1getdata(GPPort*port,char *name, u_char *data, int verbose) } p = p + len; total = total + len; - if(verbose){ - fprintf(stderr, "%6ld/", total); - fprintf(stderr, "%6ld", filelen); - fprintf(stderr, "\b\b\b\b\b\b\b\b\b\b\b\b\b"); - } } F1fclose(port); - if(verbose) - fprintf(stderr, "\n"); return(total); } diff --git a/camlibs/sonydscf1/command.h b/camlibs/sonydscf1/command.h index 232e2a450..a7071d649 100644 --- a/camlibs/sonydscf1/command.h +++ b/camlibs/sonydscf1/command.h @@ -4,7 +4,7 @@ #include "common.h" int F1ok (GPPort*); -long F1getdata (GPPort*,char *, u_char *, int); +long F1getdata (GPPort*,char *, u_char *); int F1status (GPPort*,int); char F1newstatus (GPPort *port, int, char *); int F1howmany (GPPort *); diff --git a/camlibs/sonydscf1/sonydscf1.c b/camlibs/sonydscf1/sonydscf1.c index 21512517f..0af8b2336 100644 --- a/camlibs/sonydscf1/sonydscf1.c +++ b/camlibs/sonydscf1/sonydscf1.c @@ -153,7 +153,7 @@ get_picture_information(GPPort *port,int *pmx_num, int outit) strcpy(name, "/PIC_CAM/PIC00000/PIC_INF.PMF"); F1ok(port); - len = F1getdata(port, name, buf, 0); + len = F1getdata(port, name, buf); n = buf[26] * 256 + buf[27]; /* how many files */ *pmx_num = buf[31]; /* ??? */ |