[darwinbuild-changes] [467] branches/PR-6497694/darwinup/Depot.cpp

[source_changes at macosforge.org]

Revision: 467
          http://trac.macosforge.org/projects/darwinbuild/changeset/467
Author:   wsiegrist at apple.com
Date:     2009-01-27 18:20:36 -0800 (Tue, 27 Jan 2009)
Log Message:
-----------
Fix loop to count over all list elements. Also fix some whitespace

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

Modified: branches/PR-6497694/darwinup/Depot.cpp
===================================================================
--- branches/PR-6497694/darwinup/Depot.cpp	2009-01-28 01:14:28 UTC (rev 466)
+++ branches/PR-6497694/darwinup/Depot.cpp	2009-01-28 02:20:36 UTC (rev 467)
@@ -426,18 +426,18 @@
 		// XXX: res = file->backup()
 
 		// Copy libraries gnutar uses since we need to use gnutar before they are replaced		
-		int i = 0;
+		size_t i = 0;
 		bool docopy = false;
 		const char* tarfiles[] = {"/usr/bin/tar",
-					 "/usr/bin/gnutar",
-					 "/usr/bin/bsdtar",
-					 "/usr/lib/libarchive.2.dylib",
-					 "/usr/lib/libbz2.1.0.dylib",
-					 "/usr/lib/libz.1.dylib",
-					 "/usr/lib/libSystem.B.dylib",
-					 "/usr/lib/libiconv.2.dylib",
-					 "/usr/lib/libgcc_s.1.dylib"};
-		for (i = 0; i < 3; i++) {
+					  "/usr/bin/gnutar",
+					  "/usr/bin/bsdtar",
+					  "/usr/lib/libarchive.2.dylib",
+					  "/usr/lib/libbz2.1.0.dylib",
+					  "/usr/lib/libz.1.dylib",
+					  "/usr/lib/libSystem.B.dylib",
+					  "/usr/lib/libiconv.2.dylib",
+					  "/usr/lib/libgcc_s.1.dylib"};
+		for (i = 0; i < sizeof(tarfiles)/sizeof(*tarfiles); i++) {
 		  if (strncmp(tarfiles[i], file->path(), strlen(tarfiles[i])) == 0) {
 		    docopy = true;
 		    break;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/darwinbuild-changes/attachments/20090127/59ffe738/attachment.html>