diff options
author | Elliott Hughes <enh@google.com> | 2015-02-04 20:14:50 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-04 20:14:50 +0000 |
commit | e91c3dd028c6cf551e905c5d2cfb5d1fc0c8bcb7 (patch) | |
tree | 9e7913af62ee68d339a399723f83c4ef05b79d32 /media/libstagefright/foundation | |
parent | 7bc903581f879c86f3881a2f7563bd28c1ac29b7 (diff) | |
parent | 6a025acb630a3ac4a84715d188aeb48f1946bc3f (diff) | |
download | frameworks_av-e91c3dd028c6cf551e905c5d2cfb5d1fc0c8bcb7.zip frameworks_av-e91c3dd028c6cf551e905c5d2cfb5d1fc0c8bcb7.tar.gz frameworks_av-e91c3dd028c6cf551e905c5d2cfb5d1fc0c8bcb7.tar.bz2 |
am 6a025acb: am ec0472ba: Merge "Move AString\'s StringPrintf out of the way."
* commit '6a025acb630a3ac4a84715d188aeb48f1946bc3f':
Move AString's StringPrintf out of the way.
Diffstat (limited to 'media/libstagefright/foundation')
-rw-r--r-- | media/libstagefright/foundation/AMessage.cpp | 30 | ||||
-rw-r--r-- | media/libstagefright/foundation/ANetworkSession.cpp | 6 | ||||
-rw-r--r-- | media/libstagefright/foundation/AString.cpp | 2 |
3 files changed, 19 insertions, 19 deletions
diff --git a/media/libstagefright/foundation/AMessage.cpp b/media/libstagefright/foundation/AMessage.cpp index 795e8a6..1f46bc9 100644 --- a/media/libstagefright/foundation/AMessage.cpp +++ b/media/libstagefright/foundation/AMessage.cpp @@ -426,19 +426,19 @@ AString AMessage::debugString(int32_t indent) const { AString tmp; if (isFourcc(mWhat)) { - tmp = StringPrintf( + tmp = AStringPrintf( "'%c%c%c%c'", (char)(mWhat >> 24), (char)((mWhat >> 16) & 0xff), (char)((mWhat >> 8) & 0xff), (char)(mWhat & 0xff)); } else { - tmp = StringPrintf("0x%08x", mWhat); + tmp = AStringPrintf("0x%08x", mWhat); } s.append(tmp); if (mTarget != 0) { - tmp = StringPrintf(", target = %d", mTarget); + tmp = AStringPrintf(", target = %d", mTarget); s.append(tmp); } s.append(") = {\n"); @@ -448,37 +448,37 @@ AString AMessage::debugString(int32_t indent) const { switch (item.mType) { case kTypeInt32: - tmp = StringPrintf( + tmp = AStringPrintf( "int32_t %s = %d", item.mName, item.u.int32Value); break; case kTypeInt64: - tmp = StringPrintf( + tmp = AStringPrintf( "int64_t %s = %lld", item.mName, item.u.int64Value); break; case kTypeSize: - tmp = StringPrintf( + tmp = AStringPrintf( "size_t %s = %d", item.mName, item.u.sizeValue); break; case kTypeFloat: - tmp = StringPrintf( + tmp = AStringPrintf( "float %s = %f", item.mName, item.u.floatValue); break; case kTypeDouble: - tmp = StringPrintf( + tmp = AStringPrintf( "double %s = %f", item.mName, item.u.doubleValue); break; case kTypePointer: - tmp = StringPrintf( + tmp = AStringPrintf( "void *%s = %p", item.mName, item.u.ptrValue); break; case kTypeString: - tmp = StringPrintf( + tmp = AStringPrintf( "string %s = \"%s\"", item.mName, item.u.stringValue->c_str()); break; case kTypeObject: - tmp = StringPrintf( + tmp = AStringPrintf( "RefBase *%s = %p", item.mName, item.u.refValue); break; case kTypeBuffer: @@ -486,18 +486,18 @@ AString AMessage::debugString(int32_t indent) const { sp<ABuffer> buffer = static_cast<ABuffer *>(item.u.refValue); if (buffer != NULL && buffer->data() != NULL && buffer->size() <= 64) { - tmp = StringPrintf("Buffer %s = {\n", item.mName); + tmp = AStringPrintf("Buffer %s = {\n", item.mName); hexdump(buffer->data(), buffer->size(), indent + 4, &tmp); appendIndent(&tmp, indent + 2); tmp.append("}"); } else { - tmp = StringPrintf( + tmp = AStringPrintf( "Buffer *%s = %p", item.mName, buffer.get()); } break; } case kTypeMessage: - tmp = StringPrintf( + tmp = AStringPrintf( "AMessage %s = %s", item.mName, static_cast<AMessage *>( @@ -505,7 +505,7 @@ AString AMessage::debugString(int32_t indent) const { indent + strlen(item.mName) + 14).c_str()); break; case kTypeRect: - tmp = StringPrintf( + tmp = AStringPrintf( "Rect %s(%d, %d, %d, %d)", item.mName, item.u.rectValue.mLeft, diff --git a/media/libstagefright/foundation/ANetworkSession.cpp b/media/libstagefright/foundation/ANetworkSession.cpp index 4504c2b..b230400 100644 --- a/media/libstagefright/foundation/ANetworkSession.cpp +++ b/media/libstagefright/foundation/ANetworkSession.cpp @@ -187,7 +187,7 @@ ANetworkSession::Session::Session( CHECK_GE(res, 0); in_addr_t addr = ntohl(localAddr.sin_addr.s_addr); - AString localAddrString = StringPrintf( + AString localAddrString = AStringPrintf( "%d.%d.%d.%d", (addr >> 24), (addr >> 16) & 0xff, @@ -195,7 +195,7 @@ ANetworkSession::Session::Session( addr & 0xff); addr = ntohl(remoteAddr.sin_addr.s_addr); - AString remoteAddrString = StringPrintf( + AString remoteAddrString = AStringPrintf( "%d.%d.%d.%d", (addr >> 24), (addr >> 16) & 0xff, @@ -301,7 +301,7 @@ status_t ANetworkSession::Session::readMore() { uint32_t ip = ntohl(remoteAddr.sin_addr.s_addr); notify->setString( "fromAddr", - StringPrintf( + AStringPrintf( "%u.%u.%u.%u", ip >> 24, (ip >> 16) & 0xff, diff --git a/media/libstagefright/foundation/AString.cpp b/media/libstagefright/foundation/AString.cpp index 9835ca3..b167543 100644 --- a/media/libstagefright/foundation/AString.cpp +++ b/media/libstagefright/foundation/AString.cpp @@ -366,7 +366,7 @@ status_t AString::writeToParcel(Parcel *parcel) const { return err; } -AString StringPrintf(const char *format, ...) { +AString AStringPrintf(const char *format, ...) { va_list ap; va_start(ap, format); |