[darwinbuild-changes] [721] branches/PR-7489777/darwinup
source_changes at macosforge.org
source_changes at macosforge.org
Wed Feb 24 10:29:55 PST 2010
Revision: 721
http://trac.macosforge.org/projects/darwinbuild/changeset/721
Author: wsiegrist at apple.com
Date: 2010-02-24 10:29:52 -0800 (Wed, 24 Feb 2010)
Log Message:
-----------
Cleanup Depot
Modified Paths:
--------------
branches/PR-7489777/darwinup/Depot.cpp
branches/PR-7489777/darwinup/Depot.h
Modified: branches/PR-7489777/darwinup/Depot.cpp
===================================================================
--- branches/PR-7489777/darwinup/Depot.cpp 2010-02-24 18:22:01 UTC (rev 720)
+++ branches/PR-7489777/darwinup/Depot.cpp 2010-02-24 18:29:52 UTC (rev 721)
@@ -129,11 +129,6 @@
return (m_db != NULL);
}
-
-DarwinupDatabase* Depot::get_db() {
- return m_db;
-}
-
// Unserialize an archive from the database.
// Find the archive by UUID.
Archive* Depot::archive(uuid_t uuid) {
Modified: branches/PR-7489777/darwinup/Depot.h
===================================================================
--- branches/PR-7489777/darwinup/Depot.h 2010-02-24 18:22:01 UTC (rev 720)
+++ branches/PR-7489777/darwinup/Depot.h 2010-02-24 18:29:52 UTC (rev 721)
@@ -35,7 +35,6 @@
#include <sys/types.h>
#include <uuid/uuid.h>
-#include <sqlite3.h>
#include "DB.h"
#include "Archive.h"
@@ -68,7 +67,6 @@
Archive* archive(uuid_t uuid);
Archive* archive(archive_name_t name);
Archive* archive(archive_keyword_t keyword);
- Archive* archive(sqlite3_stmt* stmt);
Archive* get_archive(const char* arg);
// returns a list of Archive*. Caller must free the list.
@@ -107,33 +105,29 @@
int has_file(Archive* archive, File* file);
- // XXX: remove me
- DarwinupDatabase* get_db();
- protected:
+protected:
// Serialize access to the Depot via flock(2).
- int lock(int operation);
- int unlock(void);
+ int lock(int operation);
+ int unlock(void);
// Inserts an Archive into the database.
// This modifies the Archive's serial number.
// If the Archive already has a serial number, it cannot be inserted.
- int insert(Archive* archive);
+ int insert(Archive* archive);
// Inserts a File into the database, as part of the specified Archive.
// This modifies the File's serial number.
// This modifies the File's Archive pointer.
// If the File already has a serial number, it cannot be inserted.
- int insert(Archive* archive, File* file);
-
+ int insert(Archive* archive, File* file);
-
// Removes an Archive from the database.
- int remove(Archive* archive);
+ int remove(Archive* archive);
// Removes a File from the database.
- int remove(File* file);
+ int remove(File* file);
int analyze_stage(const char* path, Archive* archive, Archive* rollback, int* rollback_files);
int prune_directories();
@@ -141,8 +135,8 @@
// Removes all archive entries which have no corresponding files entries.
int prune_archives();
- File* file_superseded_by(File* file);
- File* file_preceded_by(File* file);
+ File* file_superseded_by(File* file);
+ File* file_preceded_by(File* file);
int check_consistency();
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/darwinbuild-changes/attachments/20100224/15d54d8e/attachment.html>
More information about the darwinbuild-changes
mailing list