diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2009-07-25 18:07:41 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2009-07-25 18:07:41 -0700 |
| commit | 96d58f4f521ee4c1fef58efe5c009f1ea523d67c (patch) | |
| tree | 75aa0cdbbcb6e35a93c43550c724bc4dba13dbea /init/parser.c | |
| parent | dc9d52f35d6d590863b358997bf25605cf72be5f (diff) | |
| parent | 3d9b265b7d34d886a2f44e486c25e402d7df791b (diff) | |
| download | system_core-96d58f4f521ee4c1fef58efe5c009f1ea523d67c.tar.gz system_core-96d58f4f521ee4c1fef58efe5c009f1ea523d67c.tar.bz2 system_core-96d58f4f521ee4c1fef58efe5c009f1ea523d67c.zip | |
Merge korg/donut into korg/master
Diffstat (limited to 'init/parser.c')
| -rw-r--r-- | init/parser.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/init/parser.c b/init/parser.c index 6a22d242..33c1a681 100644 --- a/init/parser.c +++ b/init/parser.c @@ -60,8 +60,6 @@ void DUMP(void) #endif } -#define MAXARGS 64 - #define T_EOF 0 #define T_TEXT 1 #define T_NEWLINE 2 @@ -357,7 +355,7 @@ void parse_new_section(struct parse_state *state, int kw, static void parse_config(const char *fn, char *s) { struct parse_state state; - char *args[MAXARGS]; + char *args[SVC_MAXARGS]; int nargs; nargs = 0; @@ -384,7 +382,7 @@ static void parse_config(const char *fn, char *s) } break; case T_TEXT: - if (nargs < MAXARGS) { + if (nargs < SVC_MAXARGS) { args[nargs++] = state.text; } break; @@ -536,7 +534,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 +544,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); } |