Remove unnecessary class

native/src/resetprop/resetprop.cpp

@@ -121,28 +121,7 @@ private:
     string &val;
 };
 
-struct resetprop {
-
-    resetprop() {
-
-#ifndef APPLET_STUB_MAIN
-#define DLOAD(name) (*(void **) &name = dlsym(RTLD_DEFAULT, "__" #name))
-        // Load platform implementations
-        DLOAD(system_property_set);
-        DLOAD(system_property_read);
-        DLOAD(system_property_find);
-        DLOAD(system_property_read_callback);
-        DLOAD(system_property_foreach);
-#undef DLOAD
-#endif
-
-        if (__system_properties_init()) {
-            LOGE("resetprop: __system_properties_init error\n");
-        }
-    }
-
-
-    int set_prop(const char *name, const char *value, PropFlags flags) {
+static int set_prop(const char *name, const char *value, PropFlags flags) {
     if (!check_legal_property_name(name))
         return 1;
 
@@ -181,7 +160,7 @@ struct resetprop {
     return ret;
 }
 
-    string get_prop(const char *name, PropFlags flags) {
+static string get_prop(const char *name, PropFlags flags) {
     if (!check_legal_property_name(name))
         return "";
 
@@ -206,7 +185,7 @@ struct resetprop {
     return val;
 }
 
-    void print_props(PropFlags flags) {
+static void print_props(PropFlags flags) {
     prop_list list;
     prop_collector collector(list);
     system_property_foreach(read_prop_with_cb, &collector);
@@ -220,8 +199,7 @@ struct resetprop {
     }
 }
 
-    // Not an error when something is deleted
-    int delete_prop(const char *name, PropFlags flags) {
+static int delete_prop(const char *name, PropFlags flags) {
     LOGD("resetprop: delete prop [%s]\n", name);
 
     int ret = __system_property_delete(name, true);
@@ -232,18 +210,34 @@ struct resetprop {
     return ret;
 }
 
-    void load_file(const char *filename, PropFlags flags) {
+static void load_file(const char *filename, PropFlags flags) {
     LOGD("resetprop: Parse prop file [%s]\n", filename);
-        parse_prop_file(filename, [&](auto key, auto val) -> bool {
+    parse_prop_file(filename, [=](auto key, auto val) -> bool {
         set_prop(key.data(), val.data(), flags);
         return true;
     });
 }
+
+struct Initialize {
+    Initialize() {
+#ifndef APPLET_STUB_MAIN
+#define DLOAD(name) (*(void **) &name = dlsym(RTLD_DEFAULT, "__" #name))
+        // Load platform implementations
+        DLOAD(system_property_set);
+        DLOAD(system_property_read);
+        DLOAD(system_property_find);
+        DLOAD(system_property_read_callback);
+        DLOAD(system_property_foreach);
+#undef DLOAD
+#endif
+        if (__system_properties_init()) {
+            LOGE("resetprop: __system_properties_init error\n");
+        }
+    }
 };
 
-static resetprop *get_impl() {
-    static resetprop impl;
-    return &impl;
+static void InitOnce() {
+    struct Initialize init;
 }
 
 int resetprop_main(int argc, char *argv[]) {
@@ -265,6 +259,7 @@ int resetprop_main(int argc, char *argv[]) {
                 } else if (argv[0] == "--help"sv) {
                     usage(argv0);
                 }
+                break;
             case 'v':
                 set_log_level_state(LogLevel::Debug, true);
                 continue;
@@ -289,34 +284,34 @@ int resetprop_main(int argc, char *argv[]) {
         ++argv;
     }
 
-    resetprop *impl = get_impl();
+    InitOnce();
 
     if (flags.isDelete()) {
         if (argc != 1)
             usage(argv0);
-        return impl->delete_prop(argv[0], flags);
+        return delete_prop(argv[0], flags);
     }
 
     if (flags.isLoadFile()) {
         if (argc != 1)
             usage(argv0);
-        impl->load_file(argv[0], flags);
+        load_file(argv[0], flags);
         return 0;
     }
 
     switch (argc) {
     case 0:
-        impl->print_props(flags);
+        print_props(flags);
         return 0;
     case 1: {
-        string val = impl->get_prop(argv[0], flags);
+        string val = get_prop(argv[0], flags);
         if (val.empty())
             return 1;
         printf("%s\n", val.data());
         return 0;
     }
     case 2:
-        return impl->set_prop(argv[0], argv[1], flags);
+        return set_prop(argv[0], argv[1], flags);
     default:
         usage(argv0);
     }
@@ -327,25 +322,29 @@ int resetprop_main(int argc, char *argv[]) {
  ***********************************/
 
 string get_prop(const char *name, bool persist) {
+    InitOnce();
     PropFlags flags;
     if (persist) flags.setPersist();
-    return get_impl()->get_prop(name, flags);
+    return get_prop(name, flags);
 }
 
 int delete_prop(const char *name, bool persist) {
+    InitOnce();
     PropFlags flags;
     if (persist) flags.setPersist();
-    return get_impl()->delete_prop(name, flags);
+    return delete_prop(name, flags);
 }
 
 int set_prop(const char *name, const char *value, bool skip_svc) {
+    InitOnce();
     PropFlags flags;
     if (skip_svc) flags.setSkipSvc();
-    return get_impl()->set_prop(name, value, flags);
+    return set_prop(name, value, flags);
 }
 
 void load_prop_file(const char *filename, bool skip_svc) {
+    InitOnce();
     PropFlags flags;
     if (skip_svc) flags.setSkipSvc();
-    get_impl()->load_file(filename, flags);
+    load_file(filename, flags);
 }