summaryrefslogtreecommitdiff
path: root/socket/tcp-bsd.c
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.com>2014-04-02 11:25:27 -0400
committerOlivier CrĂȘte <olivier.crete@collabora.com>2014-04-08 23:14:47 -0400
commit1c4aeec310b22e7f93d4386da1582f79181e57cd (patch)
tree91f3ce11cef82090a79befbb2ed4610a0720b243 /socket/tcp-bsd.c
parent3a66b67876fa50dec0b5eddf659f3ceb59a6e0f2 (diff)
downloadlibnice-1c4aeec310b22e7f93d4386da1582f79181e57cd.tar.gz
tcp-bsd: Don't clear error that hasn't been set
Diffstat (limited to 'socket/tcp-bsd.c')
-rw-r--r--socket/tcp-bsd.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/socket/tcp-bsd.c b/socket/tcp-bsd.c
index c6f50a0..79a0918 100644
--- a/socket/tcp-bsd.c
+++ b/socket/tcp-bsd.c
@@ -393,8 +393,7 @@ socket_send_more (
}
if (ret < 0) {
- if (gerr != NULL &&
- g_error_matches (gerr, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK)) {
+ if (g_error_matches (gerr, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK)) {
GOutputVector local_buf = { tbs->buf, tbs->length };
NiceOutputMessage local_message = {&local_buf, 1};
@@ -403,7 +402,7 @@ socket_send_more (
g_error_free (gerr);
break;
}
- g_error_free (gerr);
+ g_clear_error (&gerr);
} else if (ret < (int) tbs->length) {
GOutputVector local_buf = { tbs->buf + ret, tbs->length - ret };
NiceOutputMessage local_message = {&local_buf, 1};