diff options
author | Dan Albert <danalbert@google.com> | 2015-03-15 22:33:53 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-15 22:33:53 +0000 |
commit | 06d60af714bfae1271be9e628e917206ec704b8b (patch) | |
tree | 9e84ddd4601fb023df0e92c809466d5fe7c1c4c3 /include | |
parent | 51d98035b15ebfbed2a7610bcd6e291079238665 (diff) | |
parent | 517f65daef177d06d7835300a1c23ce3409c0643 (diff) | |
download | system_core-06d60af714bfae1271be9e628e917206ec704b8b.zip system_core-06d60af714bfae1271be9e628e917206ec704b8b.tar.gz system_core-06d60af714bfae1271be9e628e917206ec704b8b.tar.bz2 |
am 517f65da: am a68c8148: Merge "Create libbase."
* commit '517f65daef177d06d7835300a1c23ce3409c0643':
Create libbase.
Diffstat (limited to 'include')
-rw-r--r-- | include/utils/file.h | 38 | ||||
-rw-r--r-- | include/utils/stringprintf.h | 38 |
2 files changed, 0 insertions, 76 deletions
diff --git a/include/utils/file.h b/include/utils/file.h deleted file mode 100644 index a80afb1..0000000 --- a/include/utils/file.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2015 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. - */ - -#ifndef UTILS_FILE_H -#define UTILS_FILE_H - -#include <string> -#include <sys/stat.h> - -namespace android { - -bool ReadFdToString(int fd, std::string* content); -bool ReadFileToString(const std::string& path, std::string* content); - -bool WriteStringToFile(const std::string& content, const std::string& path); -bool WriteStringToFd(const std::string& content, int fd); - -#if !defined(_WIN32) -bool WriteStringToFile(const std::string& content, const std::string& path, - mode_t mode, uid_t owner, gid_t group); -#endif - -} // namespace android - -#endif diff --git a/include/utils/stringprintf.h b/include/utils/stringprintf.h deleted file mode 100644 index e7dbac7..0000000 --- a/include/utils/stringprintf.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * 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. - */ - -#ifndef UTILS_STRINGPRINTF_H_ -#define UTILS_STRINGPRINTF_H_ - -#include <stdarg.h> -#include <string> - -namespace android { - -// Returns a string corresponding to printf-like formatting of the arguments. -std::string StringPrintf(const char* fmt, ...) - __attribute__((__format__(__printf__, 1, 2))); - -// Appends a printf-like formatting of the arguments to 'dst'. -void StringAppendF(std::string* dst, const char* fmt, ...) - __attribute__((__format__(__printf__, 2, 3))); - -// Appends a printf-like formatting of the arguments to 'dst'. -void StringAppendV(std::string* dst, const char* format, va_list ap); - -} // namespace android - -#endif |