Revert "[Feature][T8TSK-250][ADBD]add adb debug patch"
This reverts commit 0300fcc023c83b5b569b0c0799aff58cfd65dd39.
Reason for revert: <INSERT REASONING HERE>
Change-Id: I82e92daf5003f885c4732744291c57425ef27642
diff --git a/src/devtools/adb/properties.c b/src/devtools/adb/properties.c
index 520688b..20069b0 100644
--- a/src/devtools/adb/properties.c
+++ b/src/devtools/adb/properties.c
@@ -354,17 +354,12 @@
char ename[PROPERTY_KEY_MAX + 6];
char *p;
int len;
-
+
len = strlen(key);
if(len >= PROPERTY_KEY_MAX) return -1;
-
- if (strcmp(key, "persist.adb.trace_mask")) {
- memcpy(ename, "PROP_", 5);
- memcpy(ename + 5, key, len + 1);
- } else {
- memcpy(ename, "ADBD_TRACE", 11);
- }
-
+ memcpy(ename, "PROP_", 5);
+ memcpy(ename + 5, key, len + 1);
+
mutex_lock(&env_lock);
p = getenv(ename);
@@ -373,7 +368,7 @@
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);
@@ -424,7 +419,7 @@
return 0;
}
-#elif defined(UCI_PROPERTY_SUPPORT)
+#else
/* UCI configuration system implementation for OpenWrt */
#include <uci.h>
@@ -455,8 +450,7 @@
if (UCI_OK != uci_load(uciCtx, UCI_CONFIG_FILE, &pkg)) {
if (default_value) {
- unsigned int len = strlen(default_value);
- len = len < PROPERTY_VALUE_MAX ? len : PROPERTY_VALUE_MAX-1;
+ int len = strlen(default_value);
memcpy(value, default_value, len);
value[len] = '\0';
retValue = 1;
@@ -471,10 +465,7 @@
if (!strncmp(pValueData, ":empty", strlen(":empty"))) {
value[0] = '\0';
} else {
- unsigned int len = strlen(pValueData);
- len = len < PROPERTY_VALUE_MAX ? len : PROPERTY_VALUE_MAX-1;
- strncpy(value, pValueData, len);
- value[len] = '\0';
+ strncpy(value, pValueData, strlen(pValueData));
}
retValue = 1;
D("property_get, %s: %s\n", key, value);
@@ -482,8 +473,7 @@
}
if (!retValue) {
if (default_value) {
- unsigned int len = strlen(default_value);
- len = len < PROPERTY_VALUE_MAX ? len : PROPERTY_VALUE_MAX-1;
+ int len = strlen(default_value);
memcpy(value, default_value, len);
value[len] = '\0';
retValue = 1;
@@ -553,29 +543,4 @@
return 0;
}
-#else
-
-int property_get(const char *key, char *value, const char *default_value) {
- if (NULL == key || NULL == value) {
- return 0;
- }
- int retValue = 0;
-
- if (default_value) {
- int len = strlen(default_value);
- memcpy(value, default_value, len);
- value[len] = '\0';
- retValue = 1;
- }
- return retValue;
-}
-
-int property_set(const char *key, const char *new_value) {
- return 0;
-}
-
-int property_list(void (*propfn)(const char *key, const char *value, void *cookie),
- void *cookie) {
- return 0;
-}
#endif