diff options
| author | Mike Lockwood <lockwood@android.com> | 2009-05-08 11:36:11 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-05-08 11:36:11 -0700 |
| commit | 6e1683f5a770a18d58a5dbfa2347b7ad2b01a3da (patch) | |
| tree | a11fb1216a52950fbf2080c9ed4dd7bd79cdf00b /init/parser.c | |
| parent | 46f208e40d226b881736036088317c918cc5d5e7 (diff) | |
| parent | b3779558dcfbe99f0b9c1ef796e3728edad25672 (diff) | |
| download | system_core-6e1683f5a770a18d58a5dbfa2347b7ad2b01a3da.tar.gz system_core-6e1683f5a770a18d58a5dbfa2347b7ad2b01a3da.tar.bz2 system_core-6e1683f5a770a18d58a5dbfa2347b7ad2b01a3da.zip | |
am b377955: init: Fix some broken code that did not cause problems until
Merge commit 'b3779558dcfbe99f0b9c1ef796e3728edad25672'
* commit 'b3779558dcfbe99f0b9c1ef796e3728edad25672':
init: Fix some broken code that did not cause problems until switching to gcc 4.4
Diffstat (limited to 'init/parser.c')
| -rw-r--r-- | init/parser.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/init/parser.c b/init/parser.c index 6a22d242..30fa3de6 100644 --- a/init/parser.c +++ b/init/parser.c @@ -536,7 +536,7 @@ void queue_all_property_triggers() const char* name = act->name + strlen("property:"); const char* equals = strchr(name, '='); if (equals) { - char* prop_name[PROP_NAME_MAX + 1]; + char prop_name[PROP_NAME_MAX + 1]; const char* value; int length = equals - name; if (length > PROP_NAME_MAX) { @@ -546,7 +546,7 @@ void queue_all_property_triggers() prop_name[length] = 0; /* does the property exist, and match the trigger value? */ - value = property_get((const char *)&prop_name[0]); + value = property_get(prop_name); if (value && !strcmp(equals + 1, value)) { action_add_queue_tail(act); } |