From: Kim F. Storm <storm@cua.dk>
Date: Fri, 1 Mar 2002 21:04:00 +0000 (+0000)
Subject: (Fopen_network_stream): Use GCPRO6.
X-Git-Tag: ttn-vms-21-2-B4~16413
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=922eae5667702487f0996e78a9acefb296748530;p=emacs.git

(Fopen_network_stream): Use GCPRO6.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 1f04069c06a..008ac64ea07 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2002-03-01  Kim F. Storm  <storm@cua.dk>
+
+	* lisp.h (GCPRO6): New macro.
+
+	* process.c (Fopen_network_stream): Use GCPRO6.
+
 2002-03-01  Kim F. Storm  <storm@cua.dk>
 
 	* process.c (Qconnect, Qfailed): New variables.
diff --git a/src/process.c b/src/process.c
index 21845b98b41..152fd679405 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1837,7 +1837,7 @@ NON-BLOCKING is optional arg requesting an non-blocking connect.
   int ret = 0;
   int xerrno = 0;
   int s = -1, outch, inch;
-  struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
+  struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5, gcpro6;
   int retry = 0;
   int count = specpdl_ptr - specpdl;
   int count1;
@@ -1859,8 +1859,7 @@ NON-BLOCKING is optional arg requesting an non-blocking connect.
 #endif
 
   /* Can only GCPRO 5 variables */
-  sentinel = Fcons (sentinel, filter);
-  GCPRO5 (name, buffer, host, service, sentinel);
+  GCPRO6 (name, buffer, host, service, sentinel, filter);
   CHECK_STRING (name);
   CHECK_STRING (host);
 
@@ -2155,8 +2154,8 @@ NON-BLOCKING is optional arg requesting an non-blocking connect.
   XPROCESS (proc)->childp = Fcons (host, Fcons (service, Qnil));
   XPROCESS (proc)->command_channel_p = Qnil;
   XPROCESS (proc)->buffer = buffer;
-  XPROCESS (proc)->sentinel = XCAR (sentinel);
-  XPROCESS (proc)->filter = XCDR (sentinel);
+  XPROCESS (proc)->sentinel = sentinel;
+  XPROCESS (proc)->filter = filter;
   XPROCESS (proc)->command = Qnil;
   XPROCESS (proc)->pid = Qnil;
   XSETINT (XPROCESS (proc)->infd, inch);