Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove redundant checks of g_io_channel_flush return value #1405

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions debugger/src/dbm_gdb.c
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,6 @@ static GList* read_until_prompt(void)
*/
static void gdb_input_write_line(const gchar *line)
{
GIOStatus st;
GError *err = NULL;
gsize count;
const char *p;
Expand All @@ -232,7 +231,7 @@ static void gdb_input_write_line(const gchar *line)

for (p = command; *p; p += count)
{
st = g_io_channel_write_chars(gdb_ch_in, p, strlen(p), &count, &err);
GIOStatus st = g_io_channel_write_chars(gdb_ch_in, p, strlen(p), &count, &err);
if (err || (st == G_IO_STATUS_ERROR) || (st == G_IO_STATUS_EOF))
{
if (err)
Expand All @@ -246,16 +245,13 @@ static void gdb_input_write_line(const gchar *line)
}
}

st = g_io_channel_flush(gdb_ch_in, &err);
if (err || (st == G_IO_STATUS_ERROR) || (st == G_IO_STATUS_EOF))
g_io_channel_flush(gdb_ch_in, &err);
if (err)
{
if (err)
{
#ifdef DEBUG_OUTPUT
dbg_cbs->send_message(err->message, "red");
dbg_cbs->send_message(err->message, "red");
#endif
g_clear_error(&err);
}
g_clear_error(&err);
}
}

Expand Down