aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKim F. Storm2002-03-01 21:04:00 +0000
committerKim F. Storm2002-03-01 21:04:00 +0000
commit922eae5667702487f0996e78a9acefb296748530 (patch)
tree8300475cd21caa3214d6a3e9906f65cf98c5c9a2 /src
parentb7301bff689b9c38b6b4dfe35685ab7d3c7abc80 (diff)
downloademacs-922eae5667702487f0996e78a9acefb296748530.tar.gz
emacs-922eae5667702487f0996e78a9acefb296748530.zip
(Fopen_network_stream): Use GCPRO6.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/process.c9
2 files changed, 10 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 1f04069c06a..008ac64ea07 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
12002-03-01 Kim F. Storm <storm@cua.dk> 12002-03-01 Kim F. Storm <storm@cua.dk>
2 2
3 * lisp.h (GCPRO6): New macro.
4
5 * process.c (Fopen_network_stream): Use GCPRO6.
6
72002-03-01 Kim F. Storm <storm@cua.dk>
8
3 * process.c (Qconnect, Qfailed): New variables. 9 * process.c (Qconnect, Qfailed): New variables.
4 (syms_of_process): Intern and staticpro them. 10 (syms_of_process): Intern and staticpro them.
5 (Fprocess_status): Document connect and failed return values. 11 (Fprocess_status): Document connect and failed return values.
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.
1837 int ret = 0; 1837 int ret = 0;
1838 int xerrno = 0; 1838 int xerrno = 0;
1839 int s = -1, outch, inch; 1839 int s = -1, outch, inch;
1840 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5; 1840 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5, gcpro6;
1841 int retry = 0; 1841 int retry = 0;
1842 int count = specpdl_ptr - specpdl; 1842 int count = specpdl_ptr - specpdl;
1843 int count1; 1843 int count1;
@@ -1859,8 +1859,7 @@ NON-BLOCKING is optional arg requesting an non-blocking connect.
1859#endif 1859#endif
1860 1860
1861 /* Can only GCPRO 5 variables */ 1861 /* Can only GCPRO 5 variables */
1862 sentinel = Fcons (sentinel, filter); 1862 GCPRO6 (name, buffer, host, service, sentinel, filter);
1863 GCPRO5 (name, buffer, host, service, sentinel);
1864 CHECK_STRING (name); 1863 CHECK_STRING (name);
1865 CHECK_STRING (host); 1864 CHECK_STRING (host);
1866 1865
@@ -2155,8 +2154,8 @@ NON-BLOCKING is optional arg requesting an non-blocking connect.
2155 XPROCESS (proc)->childp = Fcons (host, Fcons (service, Qnil)); 2154 XPROCESS (proc)->childp = Fcons (host, Fcons (service, Qnil));
2156 XPROCESS (proc)->command_channel_p = Qnil; 2155 XPROCESS (proc)->command_channel_p = Qnil;
2157 XPROCESS (proc)->buffer = buffer; 2156 XPROCESS (proc)->buffer = buffer;
2158 XPROCESS (proc)->sentinel = XCAR (sentinel); 2157 XPROCESS (proc)->sentinel = sentinel;
2159 XPROCESS (proc)->filter = XCDR (sentinel); 2158 XPROCESS (proc)->filter = filter;
2160 XPROCESS (proc)->command = Qnil; 2159 XPROCESS (proc)->command = Qnil;
2161 XPROCESS (proc)->pid = Qnil; 2160 XPROCESS (proc)->pid = Qnil;
2162 XSETINT (XPROCESS (proc)->infd, inch); 2161 XSETINT (XPROCESS (proc)->infd, inch);