[vte] Preserve errno since the deprecated API might use it
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vte] Preserve errno since the deprecated API might use it
- Date: Tue, 30 Mar 2010 19:50:59 +0000 (UTC)
commit b6741eec1a280a590b20682e65e41ad65b84c50f
Author: Christian Persch <chpe gnome org>
Date: Tue Mar 30 20:58:43 2010 +0200
Preserve errno since the deprecated API might use it
src/pty.c | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/src/pty.c b/src/pty.c
index 05957cc..f996d9b 100644
--- a/src/pty.c
+++ b/src/pty.c
@@ -863,8 +863,10 @@ _vte_pty_grantpt(int master,
rv = grantpt(master);
if (rv != 0) {
+ int errsv = errno;
g_set_error(error, VTE_PTY_ERROR, VTE_PTY_ERROR_PTY98_FAILED,
- "%s failed: %s", "grantpt", g_strerror(errno));
+ "%s failed: %s", "grantpt", g_strerror(errsv));
+ errno = errsv;
return FALSE;
}
#endif
@@ -879,8 +881,10 @@ _vte_pty_unlockpt(int fd,
#ifdef HAVE_UNLOCKPT
rv = unlockpt(fd);
if (rv != 0) {
+ int errsv = errno;
g_set_error(error, VTE_PTY_ERROR, VTE_PTY_ERROR_PTY98_FAILED,
- "%s failed: %s", "unlockpt", g_strerror(errno));
+ "%s failed: %s", "unlockpt", g_strerror(errsv));
+ errno = errsv;
return FALSE;
}
return TRUE;
@@ -888,8 +892,10 @@ _vte_pty_unlockpt(int fd,
int zero = 0;
rv = ioctl(fd, TIOCSPTLCK, &zero);
if (rv != 0) {
+ int errsv = errno;
g_set_error(error, VTE_PTY_ERROR, VTE_PTY_ERROR_PTY98_FAILED,
- "%s failed: %s", "ioctl(TIOCSPTLCK)", g_strerror(errno));
+ "%s failed: %s", "ioctl(TIOCSPTLCK)", g_strerror(errsv));
+ errno = errsv;
return FALSE;
}
return TRUE;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]