summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2011-06-14 20:44:15 -0400
committerMatthias Clasen <mclasen@redhat.com>2011-06-14 21:06:17 -0400
commita6b9db6907117639b2493e96f8dee9e54bdba788 (patch)
tree50d97e6f69a8d4fa115a6c4f23ca6433dfe4ff9d
parent9b68d9892a125e00958ff019d5edcf4f6b409cf8 (diff)
Eliminate some dead code
-rw-r--r--glib/gspawn.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/glib/gspawn.c b/glib/gspawn.c
index 1eed98e75..4eaa33f35 100644
--- a/glib/gspawn.c
+++ b/glib/gspawn.c
@@ -173,11 +173,10 @@ read_data (GString *str,
gint fd,
GError **error)
{
- gssize bytes;
- gchar buf[4096];
+ gssize bytes;
+ gchar buf[4096];
again:
-
bytes = read (fd, buf, 4096);
if (bytes == 0)
@@ -187,9 +186,9 @@ read_data (GString *str,
g_string_append_len (str, buf, bytes);
return READ_OK;
}
- else if (bytes < 0 && errno == EINTR)
+ else if (errno == EINTR)
goto again;
- else if (bytes < 0)
+ else
{
int errsv = errno;
@@ -198,11 +197,9 @@ read_data (GString *str,
G_SPAWN_ERROR_READ,
_("Failed to read data from child process (%s)"),
g_strerror (errsv));
-
+
return READ_FAILED;
}
- else
- return READ_OK;
}
/**