Changeset 757 for trunk

Timestamp:

Jan 28, 2009, 12:00:58 AM (12 years ago)

Author:

Peter Johansson

Message:

closes #185 and avoid copying in recursive log function

Location:

trunk/lib

Files:

• Directory.cc (modified) (1 diff)
• Directory.h (modified) (2 diffs)
• File.cc (modified) (1 diff)
• File.h (modified) (1 diff)
• Node.cc (modified) (2 diffs)
• Node.h (modified) (3 diffs)

trunk/lib/Directory.cc

@@ -109 +109 @@
 
 
-  SVNlog Directory::log_core(void) const
-  {
-    SVNlog log(path());
+  void Directory::log_core(SVNlog& log) const
+  {
     for (NodeConstIterator i(daughters_.begin()); i != daughters_.end(); ++i)
       log += (*i)->log();
-    return log;
   }
 

trunk/lib/Directory.h

@@ -6 +6 @@
 /*
   Copyright (C) 2005, 2006, 2007 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2009 Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -90 +91 @@
   private:
     /**
-       @return union of logs from daughter nodes.
+       add union of logs from daughter nodes.
     */
-    SVNlog log_core(void) const;
+    void log_core(SVNlog&) const;
 
     ///

trunk/lib/File.cc

@@ -174 +174 @@
 
 
-  SVNlog File::log_core(void) const
-  {
-    return SVNlog(path());
+  void File::log_core(SVNlog&) const
+  {
   }
 

trunk/lib/File.h

@@ -77 +77 @@
 
     /**
-       @return log of this File.
+       do nothing
     */
-    SVNlog log_core(void) const;
+    void log_core(SVNlog&) const;
 
     ///

trunk/lib/Node.cc

@@ -154 +154 @@
       if (ignore())
         log_ = new SVNlog;
-      else
-        log_ = new SVNlog(log_core());
+      else {
+        log_ = new SVNlog(path());
+        log_core(*log_);
+      }
     }
     return *log_;
@@ -205 +207 @@
     if (verbose)
       std::cout << "Printing output for " << path_ << std::endl;
-    SVNlog log(path_);
+    const SVNlog& log = this->log();
     typedef std::map<std::string, Stats*>::const_iterator iter;
 

trunk/lib/Node.h

@@ -6 +6 @@
 /*
   Copyright (C) 2005, 2006, 2007 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2009 Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -199 +200 @@
   protected:
 
-    virtual SVNlog log_core(void) const=0;
-
     ///
     /// print path in html format (with anchors) to @a os
@@ -218 +217 @@
     ///
     Node(const Node&);
+
+    virtual void log_core(SVNlog&) const=0;
 
     virtual void print_core(bool verbose=false) const=0;