[darwinbuild-changes] [668] trunk/darwinup

[source_changes at macosforge.org]

Revision: 668
          http://trac.macosforge.org/projects/darwinbuild/changeset/668
Author:   wsiegrist at apple.com
Date:     2009-12-17 16:03:38 -0800 (Thu, 17 Dec 2009)
Log Message:
-----------
Whitespace cleanup

Modified Paths:
--------------
    trunk/darwinup/File.cpp
    trunk/darwinup/Utils.cpp

Modified: trunk/darwinup/File.cpp
===================================================================
--- trunk/darwinup/File.cpp	2009-12-16 18:17:05 UTC (rev 667)
+++ trunk/darwinup/File.cpp	2009-12-18 00:03:38 UTC (rev 668)
@@ -156,7 +156,7 @@
 	join_path(&dstpath, dest, path);
 
 	if (dirpath) {
-	        ssize_t len = snprintf(srcpath, sizeof(srcpath), "%s/%s", dirpath, path);
+		ssize_t len = snprintf(srcpath, sizeof(srcpath), "%s/%s", dirpath, path);
 		if ((size_t)len > sizeof(srcpath)) {
 			fprintf(stderr, "ERROR: [install] path too long: %s/%s\n", dirpath, path);
 			return -1;

Modified: trunk/darwinup/Utils.cpp
===================================================================
--- trunk/darwinup/Utils.cpp	2009-12-16 18:17:05 UTC (rev 667)
+++ trunk/darwinup/Utils.cpp	2009-12-18 00:03:38 UTC (rev 668)
@@ -184,27 +184,27 @@
 int join_path(char **out, const char *p1, const char *p2) {
 	asprintf(out, "%s/%s", p1, p2);
 	if (!out) {
-	        fprintf(stderr, "Error: join_path is out of memory!\n");
+		fprintf(stderr, "Error: join_path is out of memory!\n");
 		return -1;
 	}
 	
 	int slashes = 0;
 	char *cur = *out;
 	while (*cur != '\0') {
-	        if (*cur == '/') {
-		        slashes++;
+		if (*cur == '/') {
+			slashes++;
 		} else {
-		        // we found the next non-slash
-		        if (slashes > 1) {
-			  compact_slashes(cur, slashes);
-			} 
+			// we found the next non-slash
+			if (slashes > 1) {
+				compact_slashes(cur, slashes);
+			}
 			slashes = 0;
 		}
 		cur++;
 	}
 	// see if we had extra slashes at the very end of p2
 	if (slashes > 1) {
-	        compact_slashes(cur, slashes);
+		compact_slashes(cur, slashes);
 	} 
 	return 0;
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/darwinbuild-changes/attachments/20091217/0f6c95b0/attachment.html>