diff options
| author | Elliott Hughes <enh@google.com> | 2015-02-06 12:19:48 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2015-02-06 14:20:30 -0800 |
| commit | f682b4786a4093efb23bf80d69bf80eb274b145b (patch) | |
| tree | 8af209a035867fd30720e6e6da1b8b581aab871d /init/init.cpp | |
| parent | d558530ba90cb6218fe8e255c71a034c3fe1ea58 (diff) | |
| download | system_core-f682b4786a4093efb23bf80d69bf80eb274b145b.zip system_core-f682b4786a4093efb23bf80d69bf80eb274b145b.tar.gz system_core-f682b4786a4093efb23bf80d69bf80eb274b145b.tar.bz2 | |
Clean up reading and writing in init.
This isn't particularly useful in and of itself, but it does introduce the
first (trivial) unit test, improves the documentation (including details
about how to debug init crashes), and made me aware of how unpleasant the
existing parser is.
I also fixed a bug in passing --- unless you thought the "peboot" and "pm"
commands were features...
Bug: 19217569
Change-Id: I6ab76129a543ce3ed3dab52ef2c638009874c3de
Diffstat (limited to 'init/init.cpp')
| -rw-r--r-- | init/init.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/init/init.cpp b/init/init.cpp index da3fe96..3e3be2e 100644 --- a/init/init.cpp +++ b/init/init.cpp @@ -940,7 +940,7 @@ int selinux_reload_policy(void) return 0; } -static int audit_callback(void *data, security_class_t cls __attribute__((unused)), char *buf, size_t len) +static int audit_callback(void *data, security_class_t /*cls*/, char *buf, size_t len) { snprintf(buf, len, "property=%s", !data ? "NULL" : (char *)data); return 0; @@ -1058,7 +1058,6 @@ int main(int argc, char **argv) INFO("property init\n"); property_load_boot_defaults(); - INFO("reading config file\n"); init_parse_config_file("/init.rc"); action_for_each_trigger("early-init", action_add_queue_tail); @@ -1088,7 +1087,6 @@ int main(int argc, char **argv) /* run all property triggers based on current state of the properties */ queue_builtin_action(queue_property_triggers_action, "queue_property_triggers"); - if (BOOTCHART) { queue_builtin_action(bootchart_init_action, "bootchart_init"); } |