summaryrefslogtreecommitdiff
path: root/apt-pkg/contrib
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 16:59:40 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 16:59:40 +0000
commitff2a211aec45ac8c63ad60d75714da78d77ef69b (patch)
tree76794f1bbdaa5d55d3e373e5a283582d96b77873 /apt-pkg/contrib
parent0b3e884979228557c0032ae01febe05c490a83ff (diff)
_config->Dump is now inlined, and calls Dump(clog). Du...
Author: doogie Date: 2002-11-09 17:11:25 GMT _config->Dump is now inlined, and calls Dump(clog). Dump(ostream&) is now exported. Fixed apt-config dump sending to stderr.
Diffstat (limited to 'apt-pkg/contrib')
-rw-r--r--apt-pkg/contrib/configuration.cc6
-rw-r--r--apt-pkg/contrib/configuration.h6
2 files changed, 7 insertions, 5 deletions
diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index bc48ddefd..18d6cd9ab 100644
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: configuration.cc,v 1.23 2002/09/14 05:29:22 jgg Exp $
+// $Id: configuration.cc,v 1.24 2002/11/09 17:11:25 doogie Exp $
/* ######################################################################
Configuration Class
@@ -397,14 +397,14 @@ bool Configuration::ExistsAny(const char *Name) const
// Configuration::Dump - Dump the config /*{{{*/
// ---------------------------------------------------------------------
/* Dump the entire configuration space */
-void Configuration::Dump()
+void Configuration::Dump(ostream& str)
{
/* Write out all of the configuration directives by walking the
configuration tree */
const Configuration::Item *Top = Tree(0);
for (; Top != 0;)
{
- clog << Top->FullTag() << " \"" << Top->Value << "\";" << endl;
+ str << Top->FullTag() << " \"" << Top->Value << "\";" << endl;
if (Top->Child != 0)
{
diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h
index bc2b0fd15..418e210bc 100644
--- a/apt-pkg/contrib/configuration.h
+++ b/apt-pkg/contrib/configuration.h
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: configuration.h,v 1.14 2001/05/07 05:06:52 jgg Exp $
+// $Id: configuration.h,v 1.15 2002/11/09 17:11:25 doogie Exp $
/* ######################################################################
Configuration Class
@@ -33,6 +33,7 @@
#endif
#include <string>
+#include <iostream>
using std::string;
@@ -90,7 +91,8 @@ class Configuration
inline const Item *Tree(const char *Name) const {return Lookup(Name);};
- void Dump();
+ inline void Dump() { Dump(clog); };
+ void Dump(ostream& str);
Configuration(const Item *Root);
Configuration();