diff -r 752d4fb5e376 -r 4f08821cbff5 QTfrontend/NSWorkspace_RBAdditions.m --- a/QTfrontend/NSWorkspace_RBAdditions.m Sat Dec 03 14:43:09 2011 +0100 +++ b/QTfrontend/NSWorkspace_RBAdditions.m Sat Dec 03 15:01:57 2011 +0100 @@ -9,6 +9,7 @@ #import "NSWorkspace_RBAdditions.h" #include #include +#include NSString* NSWorkspace_RBfstypename = @"NSWorkspace_RBfstypename"; NSString* NSWorkspace_RBmntonname = @"NSWorkspace_RBmntonname"; @@ -66,14 +67,14 @@ partition = [props objectForKey:@"Content"]; } else if (IOObjectConformsTo(nextParent,"IODiskImageBlockStorageDeviceOutKernel")) { NSData* data = nil; - if (data = [[props objectForKey:@"Protocol Characteristics"] objectForKey:@"Virtual Interface Location Path"]) { + if ((data = [[props objectForKey:@"Protocol Characteristics"] objectForKey:@"Virtual Interface Location Path"])) { image = [[[NSString alloc] initWithBytes:[data bytes] length:[data length] encoding:NSUTF8StringEncoding] autorelease]; } } else if (IOObjectConformsTo(nextParent,"IOHDIXHDDriveInKernel")) { image = [props objectForKey:@"KDIURLPath"]; } NSDictionary* subdict; - if (subdict = [props objectForKey:@"Protocol Characteristics"]) { + if ((subdict = [props objectForKey:@"Protocol Characteristics"])) { connection = [subdict objectForKey:@"Physical Interconnect"]; } else { connection = [props objectForKey:@"Physical Interconnect"]; @@ -88,21 +89,21 @@ [dict setObject:image forKey:NSWorkspace_RBimagefilepath]; } NSString* value; - if (subdict = [props objectForKey:@"Device Characteristics"]) { - if (value = [subdict objectForKey:@"Product Name"]) { + if ((subdict = [props objectForKey:@"Device Characteristics"])) { + if ((value = [subdict objectForKey:@"Product Name"])) { result = AddPart(result,value); } - if (value = [subdict objectForKey:@"Product Revision Level"]) { + if ((value = [subdict objectForKey:@"Product Revision Level"])) { result = AddPart(result,value); } - if (value = [subdict objectForKey:@"Vendor Name"]) { + if ((value = [subdict objectForKey:@"Vendor Name"])) { result = AddPart(result,value); } } - if (value = [props objectForKey:@"USB Serial Number"]) { + if ((value = [props objectForKey:@"USB Serial Number"])) { result = AddPart(result,value); } - if (value = [props objectForKey:@"USB Vendor Name"]) { + if ((value = [props objectForKey:@"USB Vendor Name"])) { result = AddPart(result,value); } NSString* cls = [(NSString*)IOObjectCopyClass(nextParent) autorelease]; @@ -124,6 +125,7 @@ // This formats the (partially undocumented) AFPXMountInfo info into a string. +/* static NSString* FormatAFPURL(AFPXVolMountInfoPtr mountInfo,NSString** devdesc) { UInt8* work = ((UInt8*)mountInfo)+mountInfo->serverNameOffset; if (devdesc) { @@ -162,6 +164,7 @@ } return [NSString stringWithFormat:@"afp://%@/%@",dns?:(ip?:@""),volname]; } +*/ @implementation NSWorkspace (NSWorkspace_RBAdditions)