summaryrefslogtreecommitdiff
path: root/apt-pkg/contrib
diff options
context:
space:
mode:
authorIshan Jayawardena <udeshike@gmail.com>2011-07-16 14:08:08 +0530
committerIshan Jayawardena <udeshike@gmail.com>2011-07-16 14:08:08 +0530
commit3efe86af099d5a5d05e2e61a571da864676834c7 (patch)
tree9e49cf64bcec05922a60d28fdf162bf5312e5d9e /apt-pkg/contrib
parentd981326d00730fb1af2ba5428d9d7557d9b05f9a (diff)
fixed some indentation issues
Diffstat (limited to 'apt-pkg/contrib')
-rw-r--r--apt-pkg/contrib/fileutl.cc2
-rw-r--r--apt-pkg/contrib/strutl.cc6
2 files changed, 1 insertions, 7 deletions
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index b1724971f..0b7d91d3b 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -587,7 +587,6 @@ void SetNonBlock(int Fd,bool Block)
in seconds. */
bool WaitFd(int Fd,bool write,unsigned long timeout)
{
- //std::cerr << "WaitFd()" << std::endl;
fd_set Set;
struct timeval tv;
FD_ZERO(&Set);
@@ -618,7 +617,6 @@ bool WaitFd(int Fd,bool write,unsigned long timeout)
if (Res <= 0)
return false;
}
- //std::cerr << " waited for FD " << Fd << std::endl;
return true;
}
/*}}}*/
diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index a452f65f3..072dda3ac 100644
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -442,7 +442,6 @@ std::string OutputInDepth(const unsigned long Depth, const char* Separator)
string URItoFileName(const string &URI)
{
// Nuke 'sensitive' items
- //std::cerr << "\n>>>>URItoFileName():\n URI: " << URI << std::endl;
::URI U(URI);
U.User.clear();
U.Password.clear();
@@ -451,7 +450,6 @@ string URItoFileName(const string &URI)
// "\x00-\x20{}|\\\\^\\[\\]<>\"\x7F-\xFF";
string NewURI = QuoteString(U,"\\|{}[]<>\"^~_=!@#$%^&*");
replace(NewURI.begin(),NewURI.end(),'/','_');
- //std::cerr << " NewUri: " << NewURI << std::endl;
return NewURI;
}
/*}}}*/
@@ -725,7 +723,6 @@ string TimeRFC1123(time_t Date)
*/
bool ReadMessages(int Fd, vector<string> &List)
{
- //std::cerr << "ReadMessages() Reading from Fd " << Fd << std::endl;
char Buffer[64000];
char *End = Buffer;
// Represents any left-over from the previous iteration of the
@@ -768,7 +765,6 @@ bool ReadMessages(int Fd, vector<string> &List)
I = Buffer;
List.push_back(PartialMessage);
- //std::cerr << " pushed back message:" << PartialMessage << std::endl;
PartialMessage.clear();
}
if (End != Buffer)
@@ -794,7 +790,7 @@ bool ReadMessages(int Fd, vector<string> &List)
// -- dburrows 2008-04-02
return true;
}
- //std::cerr << " calling WaidFd again." << std::endl;
+
if (WaitFd(Fd) == false)
return false;
}