|
25 | 25 |
|
26 | 26 | // container for spawn_with_callbacks IO |
27 | 27 | typedef struct { |
28 | | - GString* stdout; |
29 | | - GString* stderr; |
| 28 | + GString* stdout_str; |
| 29 | + GString* stderr_str; |
30 | 30 | GeanyDocument* doc; |
31 | 31 |
|
32 | 32 | } AUTORUN_ASYNC_DATA; |
@@ -62,7 +62,7 @@ static void parse_command(const gchar* interceptor, GeanyDocument* doc, GSList** |
62 | 62 | command_order[cmd->order] = elem; |
63 | 63 | } |
64 | 64 |
|
65 | | - for (uint i = 0; i < g_slist_length(command_list); i++) { |
| 65 | + for (guint i = 0; i < g_slist_length(command_list); i++) { |
66 | 66 | if (!command_order[i]) { |
67 | 67 | break; // stop on the first null; |
68 | 68 | } |
@@ -193,10 +193,10 @@ static void stdioend_cb(G_GNUC_UNUSED GPid pid, G_GNUC_UNUSED gint wait_status, |
193 | 193 | // spawn_with_callbacks runs this last and closes the child |
194 | 194 | AUTORUN_ASYNC_DATA* exit_data = (AUTORUN_ASYNC_DATA*)user_data; |
195 | 195 | // our stdout/stderr is complete. Display it. |
196 | | - parse_output(exit_data->stdout->str); |
197 | | - g_string_free(exit_data->stdout, TRUE); |
198 | | - parse_output(exit_data->stderr->str); |
199 | | - g_string_free(exit_data->stderr, TRUE); |
| 196 | + parse_output(exit_data->stdout_str->str); |
| 197 | + g_string_free(exit_data->stdout_str, TRUE); |
| 198 | + parse_output(exit_data->stderr_str->str); |
| 199 | + g_string_free(exit_data->stderr_str, TRUE); |
200 | 200 | // if all the children have stopped |
201 | 201 | if (--autorun_globals->children < 1) { |
202 | 202 | // flip the ui_progress_bar back |
@@ -228,8 +228,8 @@ void dispatch_run_async(GeanyDocument* doc) { |
228 | 228 | GString* stdout_data = g_string_new(NULL); |
229 | 229 | GString* stderr_data = g_string_new(NULL); |
230 | 230 | AUTORUN_ASYNC_DATA* end_data = g_new0(AUTORUN_ASYNC_DATA, 1); |
231 | | - end_data->stdout = stdout_data; |
232 | | - end_data->stderr = stderr_data; |
| 231 | + end_data->stdout_str = stdout_data; |
| 232 | + end_data->stderr_str = stderr_data; |
233 | 233 | end_data->doc = doc; |
234 | 234 | GPid* child_pid = NULL; |
235 | 235 | gboolean success = FALSE; |
|
0 commit comments