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

Replace per Image messenger with a global one, and use image id instead.

Browse Source
This commit is contained in:
Vreixo Formoso
2008-01-19 02:48:12 +01:00
parent 88eea232aa
commit df5aa263ec
24 changed files with 254 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/tree.c
View File

@ -510,7 +510,7 @@ int iso_add_dir_src_rec(IsoImage *image, IsoDir *parent, IsoFileSource *dir)
result = iso_file_source_open(dir);
if (result < 0) {
char *path = iso_file_source_get_path(dir);
iso_msg_debug(image->messenger, "Can't open dir %s", path);
iso_msg_debug(image->id, "Can't open dir %s", path);
free(path);
return result;
}
@ -526,16 +526,16 @@ int iso_add_dir_src_rec(IsoImage *image, IsoDir *parent, IsoFileSource *dir)
path = iso_file_source_get_path(file);
if (check_excludes(image, path)) {
iso_msg_debug(image->messenger, "Skipping excluded file %s", path);
iso_msg_debug(image->id, "Skipping excluded file %s", path);
action = 2;
} else if (check_hidden(image, name)) {
iso_msg_debug(image->messenger, "Skipping hidden file %s", path);
iso_msg_debug(image->id, "Skipping hidden file %s", path);
action = 2;
} else if (check_special(image, file)) {
iso_msg_debug(image->messenger, "Skipping special file %s", path);
iso_msg_debug(image->id, "Skipping special file %s", path);
action = 2;
} else {
iso_msg_debug(image->messenger, "Adding file %s", path);
iso_msg_debug(image->id, "Adding file %s", path);
action = 1;
}
free(path);
@ -571,7 +571,7 @@ int iso_add_dir_src_rec(IsoImage *image, IsoDir *parent, IsoFileSource *dir)
result = builder->create_node(builder, image, file, &new);
if (result < 0) {
char *path = iso_file_source_get_path(file);
iso_msg_note(image->messenger, LIBISO_FILE_IGNORED,
iso_msg_note(image->id, LIBISO_FILE_IGNORED,
"Error %d when adding file %s", result, path);
free(path);
@ -620,8 +620,7 @@ int iso_add_dir_src_rec(IsoImage *image, IsoDir *parent, IsoFileSource *dir)
if (result < 0) {
/* error reading dir, should never occur */
iso_msg_sorry(image->messenger, LIBISO_CANT_READ_FILE,
"Error reading dir");
iso_msg_sorry(image->id, LIBISO_CANT_READ_FILE, "Error reading dir");
action = result;
}