aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2013-03-27 14:23:37 +0000
committerCorinna Vinschen <corinna@vinschen.de>2013-03-27 14:23:37 +0000
commit7d6a2ca15dbd912cb021e6a47d7b4dd57be58af2 (patch)
treef5628c8e409c5b8b50ee852e73f7987713748053
parent460d15371aed5068f1475036ef1f411f4e8d86e9 (diff)
* net.cc (cygwin_gethostbyname): Revert accidental checkin of change
added for debugging.
-rw-r--r--winsup/cygwin/ChangeLog.64bit5
-rw-r--r--winsup/cygwin/net.cc3
2 files changed, 6 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog.64bit b/winsup/cygwin/ChangeLog.64bit
index ae89155a3..09ec2f307 100644
--- a/winsup/cygwin/ChangeLog.64bit
+++ b/winsup/cygwin/ChangeLog.64bit
@@ -1,5 +1,10 @@
2013-03-27 Corinna Vinschen <corinna@vinschen.de>
+ * net.cc (cygwin_gethostbyname): Revert accidental checkin of change
+ added for debugging.
+
+2013-03-27 Corinna Vinschen <corinna@vinschen.de>
+
* net.cc (struct win64_servent): Define for x86_64. Explain why.
(WIN_SERVENT): Define for all targets.
(dup_ent): Use WIN_SERVENT to access critical servent members
diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc
index 72845c64e..01442955e 100644
--- a/winsup/cygwin/net.cc
+++ b/winsup/cygwin/net.cc
@@ -964,8 +964,7 @@ cygwin_getservbyname (const char *name, const char *proto)
if (efault.faulted (EFAULT))
return NULL;
- servent *res = getservbyname (name, proto);
- res = dup_ent (res);
+ servent *res = dup_ent (getservbyname (name, proto));
syscall_printf ("%p = getservbyname (%s, %s)", res, name, proto);
return res;
}