diff options
| author | Michael Drake <tlsa@netsurf-browser.org> | 2014-05-26 11:48:07 +0100 |
|---|---|---|
| committer | Michael Drake <tlsa@netsurf-browser.org> | 2014-05-26 11:48:07 +0100 |
| commit | 41e5f68d2cbc9ec9cbe8a7b963d689056fe829ed (patch) | |
| tree | 99a6492e3dda75daeb70ea215d07b28902eeb513 | |
| parent | 508fc30ab935763f82429d412b09592e1bedea4d (diff) | |
| download | netsurf-41e5f68d2cbc9ec9cbe8a7b963d689056fe829ed.tar.gz netsurf-41e5f68d2cbc9ec9cbe8a7b963d689056fe829ed.tar.bz2 | |
Scope reduce some variables.
| -rw-r--r-- | riscos/help.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/riscos/help.c b/riscos/help.c index 3c74e5419..80153a650 100644 --- a/riscos/help.c +++ b/riscos/help.c @@ -103,7 +103,7 @@ void ro_gui_interactive_help_request(wimp_message *message) bool greyed = false; wimp_menu *test_menu; os_error *error; - const char *auto_text, *auto_suffix; + const char *auto_text; int i; /* check we aren't turned off */ @@ -126,8 +126,9 @@ void ro_gui_interactive_help_request(wimp_message *message) /* do the basic window checks */ auto_text = ro_gui_wimp_event_get_help_prefix(window); if (auto_text != NULL) { - auto_suffix = ro_gui_wimp_event_get_help_suffix(window, icon, - &message_data->pos, message_data->buttons); + const char *auto_suffix = ro_gui_wimp_event_get_help_suffix( + window, icon, &message_data->pos, + message_data->buttons); if (auto_suffix == NULL) sprintf(message_token, "%s%i", auto_text, (int)icon); @@ -223,10 +224,8 @@ static void ro_gui_interactive_help_broadcast(wimp_message *message, { const char *translated_token; help_full_message_reply *reply; - char *base_token; char *local_token; os_error *error; - nserror err; /* start off with an empty reply */ reply = (help_full_message_reply *)message; @@ -238,7 +237,7 @@ static void ro_gui_interactive_help_broadcast(wimp_message *message, /* no default help for 'g' suffix */ if (token[strlen(token) - 1] != 'g') { /* find the base key from the token */ - base_token = token; + char *base_token = token; while (base_token[0] != 0x00) { if ((base_token[0] == '-') || ((base_token[0] >= '0') && @@ -254,7 +253,7 @@ static void ro_gui_interactive_help_broadcast(wimp_message *message, /* copy our message string */ if (translated_token != token) { /* convert to local encoding */ - err = utf8_to_local_encoding(translated_token, 0, + nserror err = utf8_to_local_encoding(translated_token, 0, &local_token); if (err != NSERROR_OK) { /* badenc should never happen */ @@ -293,7 +292,6 @@ bool ro_gui_interactive_help_available(void) taskmanager_task task; int context = 0; os_t time; - os_error *error; /* generic test: any help request within the last 100cs */ xos_read_monotonic_time(&time); @@ -302,6 +300,7 @@ bool ro_gui_interactive_help_available(void) /* special cases: check known application names */ do { + os_error *error; error = xtaskmanager_enumerate_tasks(context, &task, sizeof(taskmanager_task), &context, 0); if (error) { |