Use child/parent names with paths for better clarity

zorgiepoo · zorgiepoo · commit 5589a604b81c · 2015-04-04T16:44:36.000-04:00
diff --git a/Sparkle/SUBinaryDeltaTool.m b/Sparkle/SUBinaryDeltaTool.m
@@ -212,13 +212,13 @@ int main(int __unused argc, char __unused *argv[])
                 newTreeState[key] = info;
                 
                 if (oldInfo && [oldInfo[@"type"] unsignedShortValue] == FTS_D && [info[@"type"] unsignedShortValue] != FTS_D) {
-                    NSArray *pathComponents = key.pathComponents;
+                    NSArray *parentPathComponents = key.pathComponents;
 
-                    for (NSString *subpath in originalTreeState) {
-                        NSArray *subpathComponents = subpath.pathComponents;
-                        if (subpathComponents.count > pathComponents.count &&
-                            [pathComponents isEqualToArray:[subpathComponents subarrayWithRange:NSMakeRange(0, pathComponents.count)]]) {
-                            [newTreeState removeObjectForKey:subpath];
+                    for (NSString *childPath in originalTreeState) {
+                        NSArray *childPathComponents = childPath.pathComponents;
+                        if (childPathComponents.count > parentPathComponents.count &&
+                            [parentPathComponents isEqualToArray:[childPathComponents subarrayWithRange:NSMakeRange(0, parentPathComponents.count)]]) {
+                            [newTreeState removeObjectForKey:childPath];
                         }
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -212,13 +212,13 @@ int main(int __unused argc, char __unused *argv[])`
`212`	`212`	`newTreeState[key] = info;`
`213`	`213`
`214`	`214`	`if (oldInfo && [oldInfo[@"type"] unsignedShortValue] == FTS_D && [info[@"type"] unsignedShortValue] != FTS_D) {`
`215`		`- NSArray *pathComponents = key.pathComponents;`
	`215`	`+ NSArray *parentPathComponents = key.pathComponents;`
`216`	`216`
`217`		`- for (NSString *subpath in originalTreeState) {`
`218`		`- NSArray *subpathComponents = subpath.pathComponents;`
`219`		`- if (subpathComponents.count > pathComponents.count &&`
`220`		`- [pathComponents isEqualToArray:[subpathComponents subarrayWithRange:NSMakeRange(0, pathComponents.count)]]) {`
`221`		`- [newTreeState removeObjectForKey:subpath];`
	`217`	`+ for (NSString *childPath in originalTreeState) {`
	`218`	`+ NSArray *childPathComponents = childPath.pathComponents;`
	`219`	`+ if (childPathComponents.count > parentPathComponents.count &&`
	`220`	`+ [parentPathComponents isEqualToArray:[childPathComponents subarrayWithRange:NSMakeRange(0, parentPathComponents.count)]]) {`
	`221`	`+ [newTreeState removeObjectForKey:childPath];`
`222`	`222`	`}`
`223`	`223`	`}`
`224`	`224`	`}`