From cf54cad3ce7f43a522565de23a27ff90370ab88b Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Mon, 9 Mar 2020 02:05:24 -0700
Subject: [PATCH] deleteprop -> delprop

---
 native/jni/include/resetprop.hpp   |  5 +----
 native/jni/resetprop/resetprop.cpp | 10 +++++-----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/native/jni/include/resetprop.hpp b/native/jni/include/resetprop.hpp
index 576e0546a..93f0a0a62 100644
--- a/native/jni/include/resetprop.hpp
+++ b/native/jni/include/resetprop.hpp
@@ -1,6 +1,3 @@
-/* resetprop.h - API for resetprop
- */
-
 #pragma once
 
 #include <string>
@@ -10,5 +7,5 @@ int prop_exist(const char *name);
 int setprop(const char *name, const char *value, bool trigger = true);
 std::string getprop(const char *name, bool persist = false);
 void getprop(void (*callback)(const char *, const char *, void *), void *cookie, bool persist = false);
-int deleteprop(const char *name, bool persist = false);
+int delprop(const char *name, bool persist = false);
 void load_prop_file(const char *filename, bool trigger = true);
diff --git a/native/jni/resetprop/resetprop.cpp b/native/jni/resetprop/resetprop.cpp
index a88d90f8a..f3670e246 100644
--- a/native/jni/resetprop/resetprop.cpp
+++ b/native/jni/resetprop/resetprop.cpp
@@ -71,7 +71,7 @@ illegal:
 		"   -n      set properties without init triggers\n"
 		"           only affects setprop\n"
 		"   -p      access actual persist storage\n"
-		"           only affects getprop and deleteprop\n"
+		"           only affects getprop and delprop\n"
 		"\n"
 
 	, arg0);
@@ -172,7 +172,7 @@ int setprop(const char *name, const char *value, bool trigger) {
 	auto pi = (prop_info*) __system_property_find(name);
 	if (pi != nullptr) {
 		if (trigger) {
-			if (strncmp(name, "ro.", 3) == 0) deleteprop(name);
+			if (strncmp(name, "ro.", 3) == 0) delprop(name);
 			ret = __system_property_set(name, value);
 		} else {
 			ret = __system_property_update(pi, value, strlen(value));
@@ -195,13 +195,13 @@ int setprop(const char *name, const char *value, bool trigger) {
 	return ret;
 }
 
-int deleteprop(const char *name, bool persist) {
+int delprop(const char *name, bool persist) {
 	if (!check_legal_property_name(name))
 		return 1;
 	ENSURE_INIT(-1);
 	char path[PATH_MAX];
 	path[0] = '\0';
-	LOGD("resetprop: deleteprop [%s]\n", name);
+	LOGD("resetprop: delprop [%s]\n", name);
 	if (persist && strncmp(name, "persist.", 8) == 0)
 		persist = persist_deleteprop(name);
 	return __system_property_del(name) && !(persist && strncmp(name, "persist.", 8) == 0);
@@ -235,7 +235,7 @@ int resetprop_main(int argc, char *argv[]) {
 					load_prop_file(argv[1], trigger);
 					return 0;
 				} else if (strcmp(argv[0], "--delete") == 0 && argc == 2) {
-					return deleteprop(argv[1], persist);
+					return delprop(argv[1], persist);
 				} else if (strcmp(argv[0], "--help") == 0) {
 					usage(argv0);
 				}