peter
/
libraw1394
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tools/dumpiso: Add write() return code checks, fix harmless format string bug 

Addresses a few compiler warnings about unused results and format string
mismatch.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
Stefan Richter 2010-06-05 16:55:55 +02:00
parent b40bb76891
commit 8af54fd97d
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tools/dumpiso.c
View File

@ -163,13 +163,12 @@ void open_dumpfile()
return; return;
} }
file = open(filename, O_CREAT | O_WRONLY, 0666); file = creat(filename, 0666);
if (file < 0) { if (file < 0) {
perror("dumpfile open"); perror("dumpfile open");
exit(1); exit(1);
} }
ftruncate(file, 0);
write_header(); write_header();
} }
@ -180,18 +179,21 @@ iso_handler(raw1394handle_t handle, unsigned char *data,
unsigned int dropped) unsigned int dropped)
{ {
int ret; int ret;
unsigned char pad = 0;
static unsigned int counter = 0; static unsigned int counter = 0;
if (++counter % 1000 == 0) if (++counter % 1000 == 0)
fprintf(stderr, "\r%uK packets", counter/1000); fprintf(stderr, "\r%uK packets", counter/1000);
/* write header */ /* write header */
write(file, &length, sizeof(length)); if (write(file, &length, sizeof(length)) != sizeof(length) ||
write(file, &channel, sizeof(channel)); write(file, &channel, sizeof(channel)) != sizeof(channel) ||
write(file, &tag, sizeof(tag)); write(file, &tag, sizeof(tag)) != sizeof(tag) ||
write(file, &sy, sizeof(sy)); write(file, &sy, sizeof(sy)) != sizeof(sy) ||
sy = 0; write(file, &pad, sizeof(pad)) != sizeof(pad)) {
write(file, &sy, sizeof(sy)); perror("data write");
return RAW1394_ISO_ERROR;
}
while (length) { while (length) {
ret = write(file, data, length); ret = write(file, data, length);
@ -215,7 +217,7 @@ int main(int argc, char **argv)
parse_args(argc, argv); parse_args(argc, argv);
fprintf(stderr, "port: %ld\nchannels: %#016llx\nfile: %s\n", which_port, fprintf(stderr, "port: %ld\nchannels: %#016llx\nfile: %s\n", which_port,
listen_channels, filename); (long long unsigned)listen_channels, filename);
handle = raw1394_new_handle(); handle = raw1394_new_handle();
if (!handle) { if (!handle) {