diff options
author | Nicolas Geoffray <ngeoffray@google.com> | 2015-03-16 10:29:36 +0000 |
---|---|---|
committer | Nicolas Geoffray <ngeoffray@google.com> | 2015-03-16 11:07:29 +0000 |
commit | a7870d88167f619e758b5bcd15b410d16da7c16b (patch) | |
tree | 8db9bc4aa940a8b3a44cf31dacd3a7f932eadc80 /libutils/stringprintf.cpp | |
parent | acf0a8b3f632fe90132b9ce457a2237160f8cb9a (diff) | |
download | system_core-a7870d88167f619e758b5bcd15b410d16da7c16b.tar.gz system_core-a7870d88167f619e758b5bcd15b410d16da7c16b.tar.bz2 system_core-a7870d88167f619e758b5bcd15b410d16da7c16b.zip |
Revert "Create libbase."
Breaks internal master.
This reverts commit 98ff77204cef9bb8f0f27420833233622060a09e.
Change-Id: I18dc6021cb43efff8aa88486c2d980dc2b8eedba
Diffstat (limited to 'libutils/stringprintf.cpp')
-rw-r--r-- | libutils/stringprintf.cpp | 77 |
1 files changed, 77 insertions, 0 deletions
diff --git a/libutils/stringprintf.cpp b/libutils/stringprintf.cpp new file mode 100644 index 000000000..5eaa293cf --- /dev/null +++ b/libutils/stringprintf.cpp @@ -0,0 +1,77 @@ +/* + * Copyright (C) 2011 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include <utils/stringprintf.h> + +#include <stdio.h> + +void android::StringAppendV(std::string* dst, const char* format, va_list ap) { + // First try with a small fixed size buffer + char space[1024]; + + // It's possible for methods that use a va_list to invalidate + // the data in it upon use. The fix is to make a copy + // of the structure before using it and use that copy instead. + va_list backup_ap; + va_copy(backup_ap, ap); + int result = vsnprintf(space, sizeof(space), format, backup_ap); + va_end(backup_ap); + + if (result < static_cast<int>(sizeof(space))) { + if (result >= 0) { + // Normal case -- everything fit. + dst->append(space, result); + return; + } + + if (result < 0) { + // Just an error. + return; + } + } + + // Increase the buffer size to the size requested by vsnprintf, + // plus one for the closing \0. + int length = result+1; + char* buf = new char[length]; + + // Restore the va_list before we use it again + va_copy(backup_ap, ap); + result = vsnprintf(buf, length, format, backup_ap); + va_end(backup_ap); + + if (result >= 0 && result < length) { + // It fit + dst->append(buf, result); + } + delete[] buf; +} + +std::string android::StringPrintf(const char* fmt, ...) { + va_list ap; + va_start(ap, fmt); + std::string result; + StringAppendV(&result, fmt, ap); + va_end(ap); + return result; +} + +void android::StringAppendF(std::string* dst, const char* format, ...) { + va_list ap; + va_start(ap, format); + StringAppendV(dst, format, ap); + va_end(ap); +} |