[darwinbuild-changes] [768] branches/PR-7593824/darwinup/Depot.cpp

[source_changes at macosforge.org]

Revision: 768
          http://trac.macosforge.org/projects/darwinbuild/changeset/768
Author:   wsiegrist at apple.com
Date:     2010-03-11 13:04:12 -0800 (Thu, 11 Mar 2010)
Log Message:
-----------
Whitespace changes

Modified Paths:
--------------
    branches/PR-7593824/darwinup/Depot.cpp

Modified: branches/PR-7593824/darwinup/Depot.cpp
===================================================================
--- branches/PR-7593824/darwinup/Depot.cpp	2010-03-11 19:35:15 UTC (rev 767)
+++ branches/PR-7593824/darwinup/Depot.cpp	2010-03-11 21:04:12 UTC (rev 768)
@@ -126,7 +126,8 @@
 	int res = 0;
 	
 	// initialization requires all these paths to be set
-	if (!(m_prefix && m_depot_path && m_database_path && m_archives_path && m_downloads_path)) {
+	if (!(m_prefix && m_depot_path && m_database_path && 
+		  m_archives_path && m_downloads_path)) {
 		return -1;
 	}
 	
@@ -260,7 +261,8 @@
 			if (archive) {
 				list[i] = archive;
 			} else {
-				fprintf(stderr, "%s:%d: DB::make_archive returned NULL\n", __FILE__, __LINE__);
+				fprintf(stderr, "%s:%d: DB::make_archive returned NULL\n",
+						__FILE__, __LINE__);
 				res = -1;
 				break;
 			}
@@ -289,7 +291,8 @@
 			if (archive && this->is_superseded(archive)) {
 				list[cur++] = archive;
 			} else if (!archive) {
-				fprintf(stderr, "%s:%d: DB::make_archive returned NULL\n", __FILE__, __LINE__);
+				fprintf(stderr, "%s:%d: DB::make_archive returned NULL\n",
+						__FILE__, __LINE__);
 				res = -1;
 				break;
 			}
@@ -342,7 +345,8 @@
 }
 
 
-int Depot::analyze_stage(const char* path, Archive* archive, Archive* rollback, int* rollback_files) {
+int Depot::analyze_stage(const char* path, Archive* archive, Archive* rollback,
+						 int* rollback_files) {
 	int res = 0;
 	assert(archive != NULL);
 	assert(rollback != NULL);
@@ -462,7 +466,8 @@
 				
 				res = mkdir_p(backup_dirpath);
 				if (res != 0 && errno != EEXIST) {
-					fprintf(stderr, "%s:%d: %s: %s (%d)\n", __FILE__, __LINE__, backup_dirpath, strerror(errno), errno);
+					fprintf(stderr, "%s:%d: %s: %s (%d)\n", 
+							__FILE__, __LINE__, backup_dirpath, strerror(errno), errno);
 				} else {
 					res = 0;
 				}
@@ -498,7 +503,8 @@
 						}
 						
 						if (!this->has_file(rollback, parent)) {
-							IF_DEBUG("[analyze]      adding parent to rollback: %s \n", parent->path());
+							IF_DEBUG("[analyze]      adding parent to rollback: %s \n", 
+									 parent->path());
 							res = this->insert(rollback, parent);
 						}
 						assert(res == 0);
@@ -586,7 +592,8 @@
 		IF_DEBUG("[backup] copyfile(%s, %s)\n", path, dstpath);
 		res = copyfile(path, dstpath, NULL, COPYFILE_ALL|COPYFILE_NOFOLLOW);
 
-		if (res != 0) fprintf(stderr, "%s:%d: backup failed: %s: %s (%d)\n", __FILE__, __LINE__, dstpath, strerror(errno), errno);
+		if (res != 0) fprintf(stderr, "%s:%d: backup failed: %s: %s (%d)\n", 
+							  __FILE__, __LINE__, dstpath, strerror(errno), errno);
 		free(path);
 		free(dstpath);
 		free(uuidpath);
@@ -606,7 +613,8 @@
 	} else {
 		res = file->install_info(context->depot->m_prefix);
 	}
-	if (res != 0) fprintf(stderr, "%s:%d: install failed: %s: %s (%d)\n", __FILE__, __LINE__, file->path(), strerror(errno), errno);
+	if (res != 0) fprintf(stderr, "%s:%d: install failed: %s: %s (%d)\n", 
+						  __FILE__, __LINE__, file->path(), strerror(errno), errno);
 	return res;
 }
 
@@ -803,7 +811,8 @@
 	uint32_t flags = File::compare(file, actual);
 	
 	if (actual == NULL) {
-		IF_DEBUG("[uninstall]    actual file missing, possibly due to parent being removed already\n");
+		IF_DEBUG("[uninstall]    actual file missing, "
+				 "possibly due to parent being removed already\n");
 		state = '!';
 	} else if (flags != FILE_INFO_IDENTICAL) {
 		IF_DEBUG("[uninstall]    changes since install; skipping\n");
@@ -824,7 +833,8 @@
 				if (INFO_TEST(flags, FILE_INFO_DATA_DIFFERS)) {
 					state = 'U';
 					IF_DEBUG("[uninstall]    restoring\n");
-					if (res == 0) res = preceding->install(context->depot->m_archives_path, context->depot->m_prefix);
+					if (res == 0) res = preceding->install(context->depot->m_archives_path, 
+														   context->depot->m_prefix);
 				} else if (INFO_TEST(flags, FILE_INFO_MODE_DIFFERS) ||
 					   INFO_TEST(flags, FILE_INFO_GID_DIFFERS) ||
 					   INFO_TEST(flags, FILE_INFO_UID_DIFFERS)) {
@@ -848,7 +858,8 @@
 
 	fprintf(stderr, "%c %s\n", state, file->path());
 
-	if (res != 0) fprintf(stderr, "%s:%d: uninstall failed: %s\n", __FILE__, __LINE__, file->path());
+	if (res != 0) fprintf(stderr, "%s:%d: uninstall failed: %s\n", 
+						  __FILE__, __LINE__, file->path());
 
 	free(actpath);
 	return res;
@@ -1109,7 +1120,8 @@
 				delete archive;
 			}
 		}
-		fprintf(stderr, "\nWould you like to uninstall %s now? [y/n] ", inactive->count > 1 ? "them" : "it");
+		fprintf(stderr, "\nWould you like to uninstall %s now? [y/n] ", 
+				inactive->count > 1 ? "them" : "it");
 		int c = getchar();
 		fprintf(stderr, "\n");
 		if (c == 'y' || c == 'Y') {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/darwinbuild-changes/attachments/20100311/7da24900/attachment.html>