3838
3939static const NSUInteger kDefaultRecursionLimit = 64 ;
4040
41- static inline void CheckSize (GPBCodedInputStreamState *state, size_t size) {
41+ static void CheckSize (GPBCodedInputStreamState *state, size_t size) {
4242 size_t newSize = state->bufferPos + size;
4343 if (newSize > state->bufferSize ) {
4444 [NSException raise :NSParseErrorException format: @" "
@@ -50,26 +50,26 @@ static inline void CheckSize(GPBCodedInputStreamState *state, size_t size) {
5050 }
5151}
5252
53- static inline int8_t ReadRawByte (GPBCodedInputStreamState *state) {
53+ static int8_t ReadRawByte (GPBCodedInputStreamState *state) {
5454 CheckSize (state, sizeof (int8_t ));
5555 return ((int8_t *)state->bytes )[state->bufferPos++];
5656}
5757
58- static inline int32_t ReadRawLittleEndian32 (GPBCodedInputStreamState *state) {
58+ static int32_t ReadRawLittleEndian32 (GPBCodedInputStreamState *state) {
5959 CheckSize (state, sizeof (int32_t ));
6060 int32_t value = OSReadLittleInt32 (state->bytes , state->bufferPos );
6161 state->bufferPos += sizeof (int32_t );
6262 return value;
6363}
6464
65- static inline int64_t ReadRawLittleEndian64 (GPBCodedInputStreamState *state) {
65+ static int64_t ReadRawLittleEndian64 (GPBCodedInputStreamState *state) {
6666 CheckSize (state, sizeof (int64_t ));
6767 int64_t value = OSReadLittleInt64 (state->bytes , state->bufferPos );
6868 state->bufferPos += sizeof (int64_t );
6969 return value;
7070}
7171
72- static inline int32_t ReadRawVarint32 (GPBCodedInputStreamState *state) {
72+ static int32_t ReadRawVarint32 (GPBCodedInputStreamState *state) {
7373 int8_t tmp = ReadRawByte (state);
7474 if (tmp >= 0 ) {
7575 return tmp;
@@ -104,7 +104,7 @@ static inline int32_t ReadRawVarint32(GPBCodedInputStreamState *state) {
104104 return result;
105105}
106106
107- static inline int64_t ReadRawVarint64 (GPBCodedInputStreamState *state) {
107+ static int64_t ReadRawVarint64 (GPBCodedInputStreamState *state) {
108108 int32_t shift = 0 ;
109109 int64_t result = 0 ;
110110 while (shift < 64 ) {
@@ -119,7 +119,7 @@ static inline int64_t ReadRawVarint64(GPBCodedInputStreamState *state) {
119119 return 0 ;
120120}
121121
122- static inline void SkipRawData (GPBCodedInputStreamState *state, size_t size) {
122+ static void SkipRawData (GPBCodedInputStreamState *state, size_t size) {
123123 CheckSize (state, size);
124124 state->bufferPos += size;
125125}
@@ -222,7 +222,7 @@ int32_t GPBCodedInputStreamReadTag(GPBCodedInputStreamState *state) {
222222 return result;
223223}
224224
225- NSData *GPBCodedInputStreamReadRetainedData (GPBCodedInputStreamState *state) {
225+ NSData *GPBCodedInputStreamReadRetainedBytes (GPBCodedInputStreamState *state) {
226226 int32_t size = ReadRawVarint32 (state);
227227 if (size < 0 ) return nil ;
228228 CheckSize (state, size);
@@ -232,7 +232,7 @@ int32_t GPBCodedInputStreamReadTag(GPBCodedInputStreamState *state) {
232232 return result;
233233}
234234
235- NSData *GPBCodedInputStreamReadRetainedDataNoCopy (
235+ NSData *GPBCodedInputStreamReadRetainedBytesNoCopy (
236236 GPBCodedInputStreamState *state) {
237237 int32_t size = ReadRawVarint32 (state);
238238 if (size < 0 ) return nil ;
@@ -453,8 +453,8 @@ - (void)readMapEntry:(id)mapDictionary
453453 GPBCodedInputStreamPopLimit (&state_, oldLimit);
454454}
455455
456- - (NSData *)readData {
457- return [GPBCodedInputStreamReadRetainedData (&state_) autorelease ];
456+ - (NSData *)readBytes {
457+ return [GPBCodedInputStreamReadRetainedBytes (&state_) autorelease ];
458458}
459459
460460- (uint32_t )readUInt32 {
@@ -499,7 +499,7 @@ @implementation GPBString {
499499
500500// Returns true if the passed in bytes are 7 bit ascii.
501501// This routine needs to be fast.
502- static inline bool AreBytesIn7BitASCII (const uint8_t *bytes, NSUInteger len) {
502+ static bool AreBytesIn7BitASCII (const uint8_t *bytes, NSUInteger len) {
503503// In the loops below, it's more efficient to collect rather than do
504504// conditional at every step.
505505#if __LP64__
@@ -587,7 +587,7 @@ static inline bool AreBytesIn7BitASCII(const uint8_t *bytes, NSUInteger len) {
587587 return true ;
588588}
589589
590- static inline void GPBStringInitStringValue (GPBString *string) {
590+ static void GPBStringInitStringValue (GPBString *string) {
591591 OSSpinLockLock (&string->lock_ );
592592 GPBStringInitStringValueAlreadyLocked (string);
593593 OSSpinLockUnlock (&string->lock_ );
0 commit comments