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

Added verbose debug option.

Browse Source
This commit is contained in:
Vreixo Formoso 2008-02-09 17:15:58 +01:00
parent 348ddfef04
commit 02814b0ff7
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -140,6 +140,12 @@ else
CFLAGS="$CFLAGS -DDEBUG" CFLAGS="$CFLAGS -DDEBUG"
fi fi
dnl Verbose debug to make libisofs issue more debug messages
AC_ARG_ENABLE(verbose-debug,
[ --enable-verbose-debug Enable verbose debug messages [default=no]],
AC_DEFINE(LIBISOFS_VERBOSE_DEBUG, 1))
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile
doc/doxygen.conf doc/doxygen.conf

11
libisofs/filesrc.c
View File

@ -266,13 +266,12 @@ int filesrc_writer_write_data(IsoImageWriter *writer)
uint32_t nblocks = DIV_UP(iso_file_src_get_size(file), BLOCK_SIZE); uint32_t nblocks = DIV_UP(iso_file_src_get_size(file), BLOCK_SIZE);
res = filesrc_open(file); res = filesrc_open(file);
name = iso_stream_get_name(file->stream);
iso_msg_debug(t->image->id, "Writing file %s", name);
if (res < 0) { if (res < 0) {
/* /*
* UPS, very ugly error, the best we can do is just to write * UPS, very ugly error, the best we can do is just to write
* 0's to image * 0's to image
*/ */
name = iso_stream_get_name(file->stream);
res = iso_msg_submit(t->image->id, ISO_FILE_CANT_WRITE, res, res = iso_msg_submit(t->image->id, ISO_FILE_CANT_WRITE, res,
"File \"%s\" can't be opened. Filling with 0s.", name); "File \"%s\" can't be opened. Filling with 0s.", name);
free(name); free(name);
@ -289,6 +288,7 @@ int filesrc_writer_write_data(IsoImageWriter *writer)
} }
continue; continue;
} else if (res > 1) { } else if (res > 1) {
name = iso_stream_get_name(file->stream);
res = iso_msg_submit(t->image->id, ISO_FILE_CANT_WRITE, 0, res = iso_msg_submit(t->image->id, ISO_FILE_CANT_WRITE, 0,
"Size of file \"%s\" has changed. It will be %s", name, "Size of file \"%s\" has changed. It will be %s", name,
(res == 2 ? "truncated" : "padded with 0's")); (res == 2 ? "truncated" : "padded with 0's"));
@ -297,9 +297,14 @@ int filesrc_writer_write_data(IsoImageWriter *writer)
filesrc_close(file); filesrc_close(file);
return res; /* aborted due to error severity */ return res; /* aborted due to error severity */
} }
} else { }
#ifdef LIBISOFS_VERBOSE_DEBUG
else {
name = iso_stream_get_name(file->stream);
iso_msg_debug(t->image->id, "Writing file %s", name);
free(name); free(name);
} }
#endif
/* write file contents to image */ /* write file contents to image */
for (b = 0; b < nblocks; ++b) { for (b = 0; b < nblocks; ++b) {