libburnia
/
libisofs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replaced some large local variables by other means in libisofs/stream.c

This commit is contained in:
Thomas Schmitt 2011-06-12 09:59:53 +02:00
parent 9653854462
commit 4e0ca258de
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
libisofs/stream.c
View File

@ -1080,14 +1080,15 @@ int iso_stream_read_buffer(IsoStream *stream, char *buf, size_t count,
*/ */
int iso_stream_make_md5(IsoStream *stream, char md5[16], int flag) int iso_stream_make_md5(IsoStream *stream, char md5[16], int flag)
{ {
int res, is_open = 0; int ret, is_open = 0;
char buffer[2048]; char * buffer = NULL;
void *ctx= NULL; void *ctx= NULL;
off_t file_size; off_t file_size;
uint32_t b, nblocks; uint32_t b, nblocks;
size_t got_bytes; size_t got_bytes;
IsoStream *input_stream; IsoStream *input_stream;
LIBISO_ALLOC_MEM(buffer, char, 2048);
if (flag & 1) { if (flag & 1) {
while(1) { while(1) {
input_stream = iso_stream_get_input_stream(stream, 0); input_stream = iso_stream_get_input_stream(stream, 0);
@ -1098,36 +1099,37 @@ int iso_stream_make_md5(IsoStream *stream, char md5[16], int flag)
} }
if (! iso_stream_is_repeatable(stream)) if (! iso_stream_is_repeatable(stream))
return 0; {ret = 0; goto ex;}
res = iso_md5_start(&ctx); ret = iso_md5_start(&ctx);
if (res < 0) if (ret < 0)
return res; goto ex;
res = iso_stream_open(stream); ret = iso_stream_open(stream);
if (res < 0) if (ret < 0)
return 0; goto ex;
is_open = 1; is_open = 1;
file_size = iso_stream_get_size(stream); file_size = iso_stream_get_size(stream);
nblocks = DIV_UP(file_size, 2048); nblocks = DIV_UP(file_size, 2048);
for (b = 0; b < nblocks; ++b) { for (b = 0; b < nblocks; ++b) {
res = iso_stream_read_buffer(stream, buffer, 2048, &got_bytes); ret = iso_stream_read_buffer(stream, buffer, 2048, &got_bytes);
if (res < 0) { if (ret < 0) {
res = 0; ret = 0;
goto ex; goto ex;
} }
/* Do not use got_bytes to stay closer to IsoFileSrc processing */ /* Do not use got_bytes to stay closer to IsoFileSrc processing */
if (file_size - b * 2048 > 2048) if (file_size - b * 2048 > 2048)
res = 2048; ret = 2048;
else else
res = file_size - b * 2048; ret = file_size - b * 2048;
iso_md5_compute(ctx, buffer, res); iso_md5_compute(ctx, buffer, ret);
} }
res = 1; ret = 1;
ex:; ex:;
if (is_open) if (is_open)
iso_stream_close(stream); iso_stream_close(stream);
if (ctx != NULL) if (ctx != NULL)
iso_md5_end(&ctx, md5); iso_md5_end(&ctx, md5);
return res; LIBISO_FREE_MEM(buffer);
return ret;
} }
/* API */ /* API */