[darwinbuild-changes] [663] branches/PR-7431723/darwinup

[source_changes at macosforge.org]

Revision: 663
          http://trac.macosforge.org/projects/darwinbuild/changeset/663
Author:   wsiegrist at apple.com
Date:     2009-12-14 11:30:19 -0800 (Mon, 14 Dec 2009)
Log Message:
-----------
Differentiate between the get_archive API and the API that do the actual lookup

Modified Paths:
--------------
    branches/PR-7431723/darwinup/Depot.cpp
    branches/PR-7431723/darwinup/Depot.h
    branches/PR-7431723/darwinup/main.cpp

Modified: branches/PR-7431723/darwinup/Depot.cpp
===================================================================
--- branches/PR-7431723/darwinup/Depot.cpp	2009-12-14 19:13:54 UTC (rev 662)
+++ branches/PR-7431723/darwinup/Depot.cpp	2009-12-14 19:30:19 UTC (rev 663)
@@ -262,7 +262,7 @@
 //   keyword (either "newest" for the most recent root installed
 //            or     "oldest" for the oldest installed root)
 //   
-Archive* Depot::archive(const char* arg) {
+Archive* Depot::get_archive(const char* arg) {
 	uuid_t uuid;
 	uint64_t serial; 
 	if (uuid_parse(arg, uuid) == 0) {

Modified: branches/PR-7431723/darwinup/Depot.h
===================================================================
--- branches/PR-7431723/darwinup/Depot.h	2009-12-14 19:13:54 UTC (rev 662)
+++ branches/PR-7431723/darwinup/Depot.h	2009-12-14 19:30:19 UTC (rev 663)
@@ -68,7 +68,7 @@
 	Archive*	archive(uuid_t uuid);
 	Archive*	archive(archive_name_t name);
 	Archive*	archive(archive_keyword_t keyword);
-	Archive*	archive(const char* arg);
+	Archive*	get_archive(const char* arg);
 
 	int dump();
 	static int dump_archive(Archive* archive, void* context);

Modified: branches/PR-7431723/darwinup/main.cpp
===================================================================
--- branches/PR-7431723/darwinup/main.cpp	2009-12-14 19:13:54 UTC (rev 662)
+++ branches/PR-7431723/darwinup/main.cpp	2009-12-14 19:30:19 UTC (rev 663)
@@ -154,7 +154,7 @@
 	} else if (argc == 1 && strcmp(argv[0], "dump") == 0) {
 		depot->dump();
 	} else if (argc == 2 && strcmp(argv[0], "files") == 0) {
-		Archive* archive = depot->archive(argv[1]);
+		Archive* archive = depot->get_archive(argv[1]);
 		if (archive) {
 			res = depot->files(archive);
 			delete archive;
@@ -163,7 +163,7 @@
 			res = 1;
 		}
 	} else if (argc == 2 && strcmp(argv[0], "uninstall") == 0) {
-		Archive* archive = depot->archive(argv[1]);
+		Archive* archive = depot->get_archive(argv[1]);
 		if (archive) {
 			if (verbosity & VERBOSE_DEBUG) {
 				char uuid[37];
@@ -181,7 +181,7 @@
 			res = 1;
 		}
 	} else if (argc == 2 && strcmp(argv[0], "verify") == 0) {
-		Archive* archive = depot->archive(argv[1]);
+		Archive* archive = depot->get_archive(argv[1]);
 		if (archive) {
 			if (verbosity & VERBOSE_DEBUG) {
 				char uuid[37];
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/darwinbuild-changes/attachments/20091214/2c8a4786/attachment-0001.html>