@@ -36,12 +36,12 @@ { self = [super init]; @try { void *pool = objc_autoreleasePoolPush(); - const char *cString = [stringValue UTF8String]; - size_t length = [stringValue UTF8StringLength]; + const char *cString = stringValue.UTF8String; + size_t length = stringValue.UTF8StringLength; for (size_t i = 0; i < length; i++) if (!of_ascii_isdigit(cString[i]) && cString[i] != ' ') @throw [OFInvalidEncodingException exception]; @@ -68,17 +68,17 @@ if (tagClass != OF_ASN1_TAG_CLASS_UNIVERSAL || tagNumber != OF_ASN1_TAG_NUMBER_NUMERIC_STRING || constructed) @throw [OFInvalidArgumentException exception]; - if ([DEREncodedContents itemSize] != 1) + if (DEREncodedContents.itemSize != 1) @throw [OFInvalidArgumentException exception]; numericStringValue = [OFString - stringWithCString: [DEREncodedContents items] + stringWithCString: DEREncodedContents.items encoding: OF_STRING_ENCODING_ASCII - length: [DEREncodedContents count]]; + length: DEREncodedContents.count]; } @catch (id e) { [self release]; @throw e; } @@ -101,11 +101,11 @@ [super dealloc]; } - (OFString *)stringValue { - return [self numericStringValue]; + return self.numericStringValue; } - (bool)isEqual: (id)object { OFASN1NumericString *numericString; @@ -121,14 +121,14 @@ return true; } - (uint32_t)hash { - return [_numericStringValue hash]; + return _numericStringValue.hash; } - (OFString *)description { return [OFString stringWithFormat: @"", _numericStringValue]; } @end