faubackup2/src/copier distributor.cpp,1.8,1.9 filereceiver.cpp,1.4,1.5 filesender.cpp,1.4,1.5
Martin Waitz <[email protected]> Tue, 21 Jun 2005 09:16:47 +0000
| Newsgroups | gmane.comp.sysutils.backup.faubackup.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/faubackup/faubackup2/src/copier
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8992/src/copier
Modified Files:
distributor.cpp filereceiver.cpp filesender.cpp
Log Message:
more format strings
Index: distributor.cpp
===================================================================
RCS file: /cvsroot/faubackup/faubackup2/src/copier/distributor.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** distributor.cpp 14 Jun 2005 22:10:19 -0000 1.8
--- distributor.cpp 21 Jun 2005 09:16:45 -0000 1.9
***************
*** 18,23 ****
file_unchanged(file);
if(do_nothing) {
! output.information("transfer file:\t" + file.getFilename(),
! DEBUG_OUTPUT);
return;
}
--- 18,23 ----
file_unchanged(file);
if(do_nothing) {
! output.information(F_("transfer file:\t%s")
! % file.getFilename(), DEBUG_OUTPUT);
return;
}
***************
*** 31,42 ****
(file.getFileSize() > MIN_RSYNC_SIZE) &&
(rsync) ) {
! output.information("rsync file:\t" + file.getFilename(),
! DEBUG_OUTPUT);
network->sendByte(RdiffRegFile);
network->sendString(file.getFilename());
checkSum(old_dir + file.getFilename(), st.st_size, *network);
} else {
! output.information("copy file:\t" + file.getFilename() + " " + int2string(rsync),
! DEBUG_OUTPUT);
network->sendByte(CopyRegFile);
--- 31,42 ----
(file.getFileSize() > MIN_RSYNC_SIZE) &&
(rsync) ) {
! output.information(F_("rsync file:\t%s")
! % file.getFilename(), DEBUG_OUTPUT);
network->sendByte(RdiffRegFile);
network->sendString(file.getFilename());
checkSum(old_dir + file.getFilename(), st.st_size, *network);
} else {
! output.information(F_("copy file:\t%s %d")
! % file.getFilename() % rsync, DEBUG_OUTPUT);
network->sendByte(CopyRegFile);
***************
*** 47,52 ****
{
if(do_nothing) {
! output.information("Hardlink file:\t" +
! file.getFilename(), DEBUG_OUTPUT);
return;
--- 47,52 ----
{
if(do_nothing) {
! output.information(F_("Hardlink file:\t%s")
! % file.getFilename(), DEBUG_OUTPUT);
return;
***************
*** 60,65 ****
if(file.getBackupMode() == KeepExisting) {
if(do_nothing) {
! output.information("Ignore file:\t" +
! file.getFilename(), DEBUG_OUTPUT);
}
return;
--- 60,65 ----
if(file.getBackupMode() == KeepExisting) {
if(do_nothing) {
! output.information(F_("Ignore file:\t%s")
! % file.getFilename(), DEBUG_OUTPUT);
}
return;
***************
*** 67,72 ****
if(file.getNameForLink() != "") {
if(do_nothing) {
! output.information("Hardlink file:\t" +
! file.getFilename(), DEBUG_OUTPUT);
return;
}
--- 67,72 ----
if(file.getNameForLink() != "") {
if(do_nothing) {
! output.information(F_("Hardlink file:\t%s")
! % file.getFilename(), DEBUG_OUTPUT);
return;
}
***************
*** 76,81 ****
} else {
if(do_nothing) {
! output.information("Transfer file:\t" +
! file.getFilename(), DEBUG_OUTPUT);
return;
}
--- 76,81 ----
} else {
if(do_nothing) {
! output.information(F_("Transfer file:\t%s")
! % file.getFilename(), DEBUG_OUTPUT);
return;
}
***************
*** 87,92 ****
{
if(do_nothing) {
! output.information("no reg file:\t" + file.getFilename(),
! DEBUG_OUTPUT);
return;
}
--- 87,92 ----
{
if(do_nothing) {
! output.information(F_("no reg file:\t%s")
! % file.getFilename(), DEBUG_OUTPUT);
return;
}
***************
*** 127,134 ****
char *data = (char *) network->readData(size);
Fileinfo fileinfo(data, size);
! output.information("reveived Fileinfo: " +
! fileinfo.getFilename() + " Type: " +
! int2string(fileinfo.getFileType()),
! DEBUG_OUTPUT);
if(fileinfo.getFileType() == EXIT) {
if(!do_nothing)
--- 127,133 ----
char *data = (char *) network->readData(size);
Fileinfo fileinfo(data, size);
! output.information(F_("received Fileinfo: %s type %d")
! % fileinfo.getFilename()
! % fileinfo.getFileType(), DEBUG_OUTPUT);
if(fileinfo.getFileType() == EXIT) {
if(!do_nothing)
***************
*** 137,150 ****
}
! output.information("test for: " + old_dir +
! fileinfo.getFilename(), DEBUG_OUTPUT);
if(fileinfo.getFileType() != Reg) {
! output.information("no reg file: " +
! fileinfo.getFilename(), DEBUG_OUTPUT);
no_reg_file(fileinfo);
} else
if( existFile(old_dir + fileinfo.getFilename()) ) {
! output.information("file exist: " + old_dir +
! fileinfo.getFilename(), DEBUG_OUTPUT);
Fileinfo oldfile(fileinfo.getFilename(), old_dir +
--- 136,150 ----
}
! output.information(F_("test for: %s %s")
! % old_dir % fileinfo.getFilename(), DEBUG_OUTPUT);
if(fileinfo.getFileType() != Reg) {
! output.information(F_("no reg file: %s")
! % fileinfo.getFilename(), DEBUG_OUTPUT);
no_reg_file(fileinfo);
} else
if( existFile(old_dir + fileinfo.getFilename()) ) {
! output.information(F_("file exist: %s %s")
! % old_dir % fileinfo.getFilename(),
! DEBUG_OUTPUT);
Fileinfo oldfile(fileinfo.getFilename(), old_dir +
Index: filesender.cpp
===================================================================
RCS file: /cvsroot/faubackup/faubackup2/src/copier/filesender.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** filesender.cpp 14 Jun 2005 22:10:31 -0000 1.4
--- filesender.cpp 21 Jun 2005 09:16:45 -0000 1.5
***************
*** 32,36 ****
FILE *file;
if((file = fopen((currentWorkDir + name).c_str(), "rb")) == NULL) {
! output.non_critical("File " + name + " could not be opend! ", errno);
return;
}
--- 32,37 ----
FILE *file;
if((file = fopen((currentWorkDir + name).c_str(), "rb")) == NULL) {
! output.non_critical(F_("could not open %s for reading")
! % name, errno);
return;
}
Index: filereceiver.cpp
===================================================================
RCS file: /cvsroot/faubackup/faubackup2/src/copier/filereceiver.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** filereceiver.cpp 14 Jun 2005 22:10:31 -0000 1.4
--- filereceiver.cpp 21 Jun 2005 09:16:45 -0000 1.5
***************
*** 70,74 ****
if((file = fopen((backup_dir + name).c_str(), "wb+")) == NULL)
{
! output.non_critical("File " + backup_dir + name + " could not be opend! ", errno);
return;
}
--- 70,75 ----
if((file = fopen((backup_dir + name).c_str(), "wb+")) == NULL)
{
! output.non_critical(F_("could not open %s for writing")
! % (backup_dir + name), errno);
return;
}
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click