[Aptitude-svn-commit] r4351 - in branches/aptitude-0.3/aptitude: . src/cmdline

[Daniel Burrows]

Author: dburrows
Date: Fri Sep 30 00:23:07 2005
New Revision: 4351

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/cmdline/cmdline_changelog.cc
Log:
Fix the command-line changelog code.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Fri Sep 30 00:23:07 2005
@@ -1,5 +1,11 @@
 2005-09-29  Daniel Burrows  <dburrows at debian.org>
 
+	* src/cmdline/cmdline_changelog.cc:
+
+	  Fix the command-line changelog code: binding a reference doesn't
+	  really work, you have to bind a pointer to the object you want
+	  to set instead.
+
 	* src/cmdline/cmdline_changelog.cc, src/view_changelog.cc:
 
 	  Update the changelog viewers for the new interface.

Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_changelog.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_changelog.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_changelog.cc	Fri Sep 30 00:23:07 2005
@@ -85,9 +85,9 @@
     return changelog_entity(pkg, ver, parser->Section());
 }
 
-static void set_name(temp::name n, temp::name &target)
+static void set_name(temp::name n, temp::name *target)
 {
-  target = n;
+  *target = n;
 }
 
 /** Try to find a particular package version without knowing the
@@ -108,15 +108,15 @@
 
   res = cmdline_do_download(get_changelog_from_source(pkg, ver, "", pkg,
 						      sigc::bind(sigc::ptr_fun(set_name),
-								 rval)));
+								 &rval)));
 
   if(res != download_manager::success || !rval.valid())
     res = cmdline_do_download(get_changelog_from_source(pkg, ver, "contrib/foo", pkg,
-						  sigc::bind(sigc::ptr_fun(set_name), rval)));
+						  sigc::bind(sigc::ptr_fun(set_name), &rval)));
 
   if(res != download_manager::success || !rval.valid())
      res = cmdline_do_download(get_changelog_from_source(pkg, ver, "non-free/foo", pkg,
-							 sigc::bind(sigc::ptr_fun(set_name), rval)));
+							 sigc::bind(sigc::ptr_fun(set_name), &rval)));
 
   if(res != download_manager::success)
     return temp::name();
@@ -233,7 +233,7 @@
 	    filename = changelog_by_version(package, sourcestr);
 	  else
 	    cmdline_do_download(get_changelog(ver,
-					      sigc::bind(sigc::ptr_fun(&set_name), filename)));
+					      sigc::bind(sigc::ptr_fun(&set_name), &filename)));
 	}
       else
 	{
@@ -282,7 +282,7 @@
 					    ent.ver,
 					    ent.section,
 					    ent.pkg,
-					    sigc::bind(sigc::ptr_fun(&set_name), filename));
+					    sigc::bind(sigc::ptr_fun(&set_name), &filename));
 
 	      cmdline_do_download(m);
 	    }