diff options
author | Narayan Kamath <narayan@google.com> | 2015-02-21 09:51:18 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-02-21 09:51:18 +0000 |
commit | f1ac6917da172dd3e6829bac41fcbf23e96da079 (patch) | |
tree | 939fa08153802f57e50ce74f6f3b3b390755ab7e | |
parent | 1158c7d5fe7086b42f70a81381558f35b6cd27a9 (diff) | |
parent | 453a33281247d05dda08e535b3c5fb4e4bc2ae19 (diff) | |
download | system_core-f1ac6917da172dd3e6829bac41fcbf23e96da079.zip system_core-f1ac6917da172dd3e6829bac41fcbf23e96da079.tar.gz system_core-f1ac6917da172dd3e6829bac41fcbf23e96da079.tar.bz2 |
Merge "Remove loghack.h."
-rw-r--r-- | libcutils/loghack.h | 38 | ||||
-rw-r--r-- | libcutils/properties.c | 84 |
2 files changed, 1 insertions, 121 deletions
diff --git a/libcutils/loghack.h b/libcutils/loghack.h deleted file mode 100644 index 750cab0..0000000 --- a/libcutils/loghack.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2007 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. - */ - -/** - * This is a temporary hack to enable logging from cutils. - */ - -#ifndef _CUTILS_LOGHACK_H -#define _CUTILS_LOGHACK_H - -#ifdef HAVE_ANDROID_OS -#include <cutils/log.h> -#else -#include <stdio.h> -#define ALOG(level, ...) \ - ((void)printf("cutils:" level "/" LOG_TAG ": " __VA_ARGS__)) -#define ALOGV(...) ALOG("V", __VA_ARGS__) -#define ALOGD(...) ALOG("D", __VA_ARGS__) -#define ALOGI(...) ALOG("I", __VA_ARGS__) -#define ALOGW(...) ALOG("W", __VA_ARGS__) -#define ALOGE(...) ALOG("E", __VA_ARGS__) -#define LOG_ALWAYS_FATAL(...) do { ALOGE(__VA_ARGS__); exit(1); } while (0) -#endif - -#endif // _CUTILS_LOGHACK_H diff --git a/libcutils/properties.c b/libcutils/properties.c index 1190ab7..4e46e02 100644 --- a/libcutils/properties.c +++ b/libcutils/properties.c @@ -28,7 +28,7 @@ #include <cutils/properties.h> #include <stdbool.h> #include <inttypes.h> -#include "loghack.h" +#include <log/log.h> int8_t property_get_bool(const char *key, int8_t default_value) { if (!key) { @@ -104,8 +104,6 @@ int32_t property_get_int32(const char *key, int32_t default_value) { return (int32_t)property_get_imax(key, INT32_MIN, INT32_MAX, default_value); } -#ifdef __BIONIC__ - #define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_ #include <sys/_system_properties.h> @@ -156,83 +154,3 @@ int property_list( struct property_list_callback_data data = { propfn, cookie }; return __system_property_foreach(property_list_callback, &data); } - -#else - -/* SUPER-cheesy place-holder implementation for glibc/Mac OS/Windows. */ - -#include <cutils/threads.h> - -static mutex_t env_lock = MUTEX_INITIALIZER; - -int property_get(const char *key, char *value, const char *default_value) -{ - char ename[PROPERTY_KEY_MAX + 6]; - char *p; - int len; - - len = strlen(key); - if(len >= PROPERTY_KEY_MAX) return -1; - memcpy(ename, "PROP_", 5); - memcpy(ename + 5, key, len + 1); - - mutex_lock(&env_lock); - - p = getenv(ename); - if(p == 0) p = ""; - len = strlen(p); - if(len >= PROPERTY_VALUE_MAX) { - len = PROPERTY_VALUE_MAX - 1; - } - - if((len == 0) && default_value) { - len = strlen(default_value); - memcpy(value, default_value, len + 1); - } else { - memcpy(value, p, len); - value[len] = 0; - } - - mutex_unlock(&env_lock); - - return len; -} - - -int property_set(const char *key, const char *value) -{ - char ename[PROPERTY_KEY_MAX + 6]; - char *p; - int len; - int r; - - if(strlen(value) >= PROPERTY_VALUE_MAX) return -1; - - len = strlen(key); - if(len >= PROPERTY_KEY_MAX) return -1; - memcpy(ename, "PROP_", 5); - memcpy(ename + 5, key, len + 1); - - mutex_lock(&env_lock); -#ifdef HAVE_MS_C_RUNTIME - { - char temp[256]; - snprintf( temp, sizeof(temp), "%s=%s", ename, value); - putenv(temp); - r = 0; - } -#else - r = setenv(ename, value, 1); -#endif - mutex_unlock(&env_lock); - - return r; -} - -int property_list(void (*propfn)(const char *key, const char *value, void *cookie), - void *cookie) -{ - return 0; -} - -#endif |