@@ -23,23 +23,23 @@ #import "OFInvalidEncodingException.h" @implementation OFASN1PrintableString @synthesize printableStringValue = _printableStringValue; -+ (instancetype)stringWithStringValue: (OFString *)stringValue ++ (instancetype)stringWithString: (OFString *)string { - return [[[self alloc] initWithStringValue: stringValue] autorelease]; + return [[[self alloc] initWithString: string] autorelease]; } -- (instancetype)initWithStringValue: (OFString *)stringValue +- (instancetype)initWithString: (OFString *)string { self = [super init]; @try { void *pool = objc_autoreleasePoolPush(); - const char *cString = stringValue.UTF8String; - size_t length = stringValue.UTF8StringLength; + const char *cString = string.UTF8String; + size_t length = string.UTF8StringLength; for (size_t i = 0; i < length; i++) { if (of_ascii_isalnum(cString[i])) continue; @@ -60,11 +60,11 @@ default: @throw [OFInvalidEncodingException exception]; } } - _printableStringValue = [stringValue copy]; + _printableStringValue = [string copy]; objc_autoreleasePoolPop(pool); } @catch (id e) { [self release]; @throw e; @@ -77,11 +77,11 @@ tagNumber: (of_asn1_tag_number_t)tagNumber constructed: (bool)constructed DEREncodedContents: (OFData *)DEREncodedContents { void *pool = objc_autoreleasePoolPush(); - OFString *printableStringValue; + OFString *printableString; @try { if (tagClass != OF_ASN1_TAG_CLASS_UNIVERSAL || tagNumber != OF_ASN1_TAG_NUMBER_PRINTABLE_STRING || constructed) @@ -88,20 +88,20 @@ @throw [OFInvalidArgumentException exception]; if (DEREncodedContents.itemSize != 1) @throw [OFInvalidArgumentException exception]; - printableStringValue = [OFString + printableString = [OFString stringWithCString: DEREncodedContents.items encoding: OF_STRING_ENCODING_ASCII length: DEREncodedContents.count]; } @catch (id e) { [self release]; @throw e; } - self = [self initWithStringValue: printableStringValue]; + self = [self initWithString: printableString]; objc_autoreleasePoolPop(pool); return self; }