[darwinbuild-changes] [487] branches/PR-6688645/darwinup/Depot.cpp
source_changes at macosforge.org
source_changes at macosforge.org
Wed Mar 18 18:44:32 PDT 2009
Revision: 487
http://trac.macosforge.org/projects/darwinbuild/changeset/487
Author: wsiegrist at apple.com
Date: 2009-03-18 18:44:32 -0700 (Wed, 18 Mar 2009)
Log Message:
-----------
Whitespace only
Modified Paths:
--------------
branches/PR-6688645/darwinup/Depot.cpp
Modified: branches/PR-6688645/darwinup/Depot.cpp
===================================================================
--- branches/PR-6688645/darwinup/Depot.cpp 2009-03-19 01:37:38 UTC (rev 486)
+++ branches/PR-6688645/darwinup/Depot.cpp 2009-03-19 01:44:32 UTC (rev 487)
@@ -363,8 +363,8 @@
// we need the path minus our destination path for moving to the archive
char *relpath = strstr(actual->path(), m_prefix);
if (relpath) {
- // advance to just past the destination path
- relpath += strlen(m_prefix);
+ // advance to just past the destination path
+ relpath += strlen(m_prefix);
}
size_t len = strlcpy(path, (relpath ? relpath : actual->path()),
@@ -446,8 +446,8 @@
// we need the path minus our destination path for moving to the archive
relpath = strstr(file->path(), context->depot->m_prefix);
if (relpath) {
- // advance to just past the destination path
- relpath += strlen(context->depot->m_prefix);
+ // advance to just past the destination path
+ relpath += strlen(context->depot->m_prefix);
}
uuid_unparse_upper(context->archive->uuid(), uuidstr);
asprintf(&dstpath, "%s/%s/%s", context->depot->m_archives_path,
@@ -473,17 +473,17 @@
"/usr/lib/libgcc_s"};
size_t numfiles = sizeof(tarfiles)/sizeof(*tarfiles);
for (i = 0; i < numfiles; i++) {
- if (strncmp(tarfiles[i], file->path(), strlen(tarfiles[i])) == 0) {
- docopy = true;
- break;
- }
+ if (strncmp(tarfiles[i], file->path(), strlen(tarfiles[i])) == 0) {
+ docopy = true;
+ break;
+ }
}
if (docopy) {
- IF_DEBUG("[backup] copyfile(%s, %s)\n", file->path(), dstpath);
- res = copyfile(file->path(), dstpath, NULL, COPYFILE_ALL);
+ IF_DEBUG("[backup] copyfile(%s, %s)\n", file->path(), dstpath);
+ res = copyfile(file->path(), dstpath, NULL, COPYFILE_ALL);
} else {
- IF_DEBUG("[backup] rename(%s, %s)\n", file->path(), dstpath);
- res = rename(file->path(), dstpath);
+ IF_DEBUG("[backup] rename(%s, %s)\n", file->path(), dstpath);
+ res = rename(file->path(), dstpath);
}
if (res != 0) fprintf(stderr, "%s:%d: backup failed: %s: %s (%d)\n", __FILE__, __LINE__, dstpath, strerror(errno), errno);
@@ -518,8 +518,8 @@
// Check the consistency of the database before proceeding with the installation
// If this fails, abort the installation.
-// res = this->check_consistency();
-// if (res != 0) return res;
+ // res = this->check_consistency();
+ // if (res != 0) return res;
res = this->lock(LOCK_EX);
if (res != 0) return res;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/darwinbuild-changes/attachments/20090318/e4ff88ee/attachment-0001.html>
More information about the darwinbuild-changes
mailing list