* undelfs.c (undelfs_opendir): Use parametrized messages without

VFS name for success and failure.
* fish.c (dir_load): Use new messages from undelfs.c, indicate
success by printing "done".
* ftpfs.c (dir_load): Likewise.
This commit is contained in:
Pavel Roskin 2002-07-19 04:29:37 +00:00
parent bd2e7db466
commit 0b4a33c10f
4 changed files with 17 additions and 6 deletions

View File

@ -1,3 +1,11 @@
2002-07-19 Pavel Roskin <proski@gnu.org>
* undelfs.c (undelfs_opendir): Use parametrized messages without
VFS name for success and failure.
* fish.c (dir_load): Use new messages from undelfs.c, indicate
success by printing "done".
* ftpfs.c (dir_load): Likewise.
2002-07-15 Pavel Roskin <proski@gnu.org>
* cpio.c (cpio_read_crc_head): Undo change in the error message.

View File

@ -464,11 +464,13 @@ dir_load(vfs *me, vfs_s_inode *dir, char *remote_path)
vfs_s_free_entry (me, ent);
me->verrno = E_REMOTE;
if (decode_reply(buffer+4, 0) == COMPLETE)
return 0;
if (decode_reply(buffer+4, 0) == COMPLETE) {
print_vfs_message (_("%s: done."), me->name);
return 0;
}
error:
print_vfs_message(_("fish: failed"));
print_vfs_message (_("%s: failure"), me->name);
return 1;
}

View File

@ -1320,7 +1320,7 @@ again:
close (sock);
disable_interrupt_key();
get_reply(me, SUP.sock, NULL, 0);
print_vfs_message(_("ftpfs: failed"));
print_vfs_message (_("%s: failure"), me->name);
return -1;
}
@ -1368,6 +1368,7 @@ again:
dcache->symlink_status = FTPFS_UNRESOLVED_SYMLINKS;
}
#endif
print_vfs_message (_("%s: done."), me->name);
return 0;
fallback:

View File

@ -310,10 +310,10 @@ undelfs_opendir (vfs *me, char *dirname)
/* Now load the deleted information */
if (!undelfs_loaddel ())
goto quit_opendir;
print_vfs_message (_("undelfs: done."));
print_vfs_message (_("%s: done."), me->name);
return fs;
quit_opendir:
print_vfs_message (_("undelfs: failure"));
print_vfs_message (_("%s: failure"), me->name);
ext2fs_close (fs);
fs = NULL;
return 0;