HCoop
/
ntk
/
apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed list notation doc bug and 'b' vs 'B'
[ntk/apt.git]
/
cmdline
/
acqprogress.cc
diff --git
a/cmdline/acqprogress.cc
b/cmdline/acqprogress.cc
index
a5383a8
..
5e88d3c
100644
(file)
--- a/
cmdline/acqprogress.cc
+++ b/
cmdline/acqprogress.cc
@@
-1,6
+1,6
@@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: acqprogress.cc,v 1.1
3 1999/04/20 05:59:29
jgg Exp $
+// $Id: acqprogress.cc,v 1.1
4 1999/06/06 05:52:37
jgg Exp $
/* ######################################################################
Acquire Progress - Command line progress meter
/* ######################################################################
Acquire Progress - Command line progress meter
@@
-48,7
+48,7
@@
void AcqTextStatus::IMSHit(pkgAcquire::ItemDesc &Itm)
cout << "Hit " << Itm.Description;
if (Itm.Owner->FileSize != 0)
cout << "Hit " << Itm.Description;
if (Itm.Owner->FileSize != 0)
- cout << " [" << SizeToStr(Itm.Owner->FileSize) << "
b
]";
+ cout << " [" << SizeToStr(Itm.Owner->FileSize) << "
B
]";
cout << endl;
Update = true;
};
cout << endl;
Update = true;
};
@@
-72,7
+72,7
@@
void AcqTextStatus::Fetch(pkgAcquire::ItemDesc &Itm)
cout << "Get:" << Itm.Owner->ID << ' ' << Itm.Description;
if (Itm.Owner->FileSize != 0)
cout << "Get:" << Itm.Owner->ID << ' ' << Itm.Description;
if (Itm.Owner->FileSize != 0)
- cout << " [" << SizeToStr(Itm.Owner->FileSize) << "
b
]";
+ cout << " [" << SizeToStr(Itm.Owner->FileSize) << "
B
]";
cout << endl;
};
/*}}}*/
cout << endl;
};
/*}}}*/
@@
-122,9
+122,9
@@
void AcqTextStatus::Stop()
cout << '\r' << BlankLine << '\r';
if (FetchedBytes != 0)
cout << '\r' << BlankLine << '\r';
if (FetchedBytes != 0)
- cout << "Fetched " << SizeToStr(FetchedBytes) << "
b
in " <<
+ cout << "Fetched " << SizeToStr(FetchedBytes) << "
B
in " <<
TimeToStr(ElapsedTime) << " (" << SizeToStr(CurrentCPS) <<
TimeToStr(ElapsedTime) << " (" << SizeToStr(CurrentCPS) <<
- "
b
/s)" << endl;
+ "
B
/s)" << endl;
}
/*}}}*/
// AcqTextStatus::Pulse - Regular event pulse /*{{{*/
}
/*}}}*/
// AcqTextStatus::Pulse - Regular event pulse /*{{{*/
@@
-189,7
+189,7
@@
void AcqTextStatus::Pulse(pkgAcquire *Owner)
else
{
if (Mode == Medium || I->TotalSize == 0)
else
{
if (Mode == Medium || I->TotalSize == 0)
- snprintf(S,End-S," %s
b
",SizeToStr(I->CurrentSize).c_str());
+ snprintf(S,End-S," %s
B
",SizeToStr(I->CurrentSize).c_str());
}
S += strlen(S);
}
S += strlen(S);
@@
-200,7
+200,7
@@
void AcqTextStatus::Pulse(pkgAcquire *Owner)
snprintf(S,End-S," %lu%%",
long(double(I->CurrentSize*100.0)/double(I->TotalSize)));
else
snprintf(S,End-S," %lu%%",
long(double(I->CurrentSize*100.0)/double(I->TotalSize)));
else
- snprintf(S,End-S,"/%s
b
%lu%%",SizeToStr(I->TotalSize).c_str(),
+ snprintf(S,End-S,"/%s
B
%lu%%",SizeToStr(I->TotalSize).c_str(),
long(double(I->CurrentSize*100.0)/double(I->TotalSize)));
}
S += strlen(S);
long(double(I->CurrentSize*100.0)/double(I->TotalSize)));
}
S += strlen(S);
@@
-222,7
+222,7
@@
void AcqTextStatus::Pulse(pkgAcquire *Owner)
{
char Tmp[300];
unsigned long ETA = (unsigned long)((TotalBytes - CurrentBytes)/CurrentCPS);
{
char Tmp[300];
unsigned long ETA = (unsigned long)((TotalBytes - CurrentBytes)/CurrentCPS);
- sprintf(Tmp," %s
b
/s %s",SizeToStr(CurrentCPS).c_str(),TimeToStr(ETA).c_str());
+ sprintf(Tmp," %s
B
/s %s",SizeToStr(CurrentCPS).c_str(),TimeToStr(ETA).c_str());
unsigned int Len = strlen(Buffer);
unsigned int LenT = strlen(Tmp);
if (Len + LenT < ScreenWidth)
unsigned int Len = strlen(Buffer);
unsigned int LenT = strlen(Tmp);
if (Len + LenT < ScreenWidth)