~mdw
/
dvdrip
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
multiprogress.c: Remove pointless return value from `setup_render_state'.
[dvdrip]
/
chkdvdimg.c
diff --git
a/chkdvdimg.c
b/chkdvdimg.c
index
0adc6df
..
05fa7e1
100644
(file)
--- a/
chkdvdimg.c
+++ b/
chkdvdimg.c
@@
-102,9
+102,7
@@
static void check_img(const char *file)
secaddr end;
unsigned i, j;
secaddr end;
unsigned i, j;
- fd = open(file, (flags&F_FIX) ? O_RDWR : O_RDONLY);
- if (fd < 0)
- { gripe_syserr(2, errno, "failed to open `%s'", file); goto end; }
+ open_dvd(file, (flags&F_FIX) ? O_RDWR : O_RDONLY, &fd, 0);
blksz = SECTORSZ; volsz = device_size(fd, file, &blksz);
if (SECTORSZ != 2048)
{ gripe(2, "device sector size %d /= 2048", blksz); goto end; }
blksz = SECTORSZ; volsz = device_size(fd, file, &blksz);
if (SECTORSZ != 2048)
{ gripe(2, "device sector size %d /= 2048", blksz); goto end; }
@@
-124,7
+122,7
@@
static void check_img(const char *file)
if (bb[0] || !all_zero_p(bb, SECTORSZ)) goto nonzero;
}
gripe(1, "too many trailing zero sectors: "
if (bb[0] || !all_zero_p(bb, SECTORSZ)) goto nonzero;
}
gripe(1, "too many trailing zero sectors: "
- "couldn't find backup anchor descriptor
"
);
+ "couldn't find backup anchor descriptor
in `%s'", file
);
goto end;
nonzero:
j = i;
goto end;
nonzero:
j = i;
@@
-193,7
+191,9
@@
int main(int argc, char *argv[])
}
if (optind >= argc) f |= f_bogus;
if (f&f_bogus) { usage(stderr); exit(2); }
}
if (optind >= argc) f |= f_bogus;
if (f&f_bogus) { usage(stderr); exit(2); }
-
+ setlocale(LC_ALL, "");
+ progress_init(&progress);
for (i = optind; i < argc; i++) check_img(argv[i]);
for (i = optind; i < argc; i++) check_img(argv[i]);
+ progress_free(&progress);
return (status);
}
return (status);
}