aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2016-08-10 13:19:15 -0700
committerPaul Eggert2016-08-10 13:19:36 -0700
commitcd3524061346dec4ec820c98b6ca8046eda290c3 (patch)
tree02d2a0db1da605dee44bdb62faa52757ce20ef17
parent76f3328199a6911170a6c3f258e8c11545663d89 (diff)
downloademacs-cd3524061346dec4ec820c98b6ca8046eda290c3.tar.gz
emacs-cd3524061346dec4ec820c98b6ca8046eda290c3.zip
Omit unnecessary process initialization
* src/process.c (make_process, Fmake_process) (Fmake_pipe_process, Fmake_serial_process) (Fmake_network_process, server_accept_connection): Omit unnecessary initialization of already-cleared storage.
-rw-r--r--src/process.c34
1 files changed, 18 insertions, 16 deletions
diff --git a/src/process.c b/src/process.c
index 5e48e4348fe..fb326982e5d 100644
--- a/src/process.c
+++ b/src/process.c
@@ -720,8 +720,9 @@ make_process (Lisp_Object name)
720 p->open_fd[i] = -1; 720 p->open_fd[i] = -1;
721 721
722#ifdef HAVE_GNUTLS 722#ifdef HAVE_GNUTLS
723 p->gnutls_initstage = GNUTLS_STAGE_EMPTY; 723 verify (GNUTLS_STAGE_EMPTY == 0);
724 p->gnutls_boot_parameters = Qnil; 724 eassert (p->gnutls_initstage == GNUTLS_STAGE_EMPTY);
725 eassert (NILP (p->gnutls_boot_parameters));
725#endif 726#endif
726 727
727 /* If name is already in use, modify it until it is unused. */ 728 /* If name is already in use, modify it until it is unused. */
@@ -1514,7 +1515,7 @@ usage: (make-process &rest ARGS) */)
1514 record_unwind_protect (start_process_unwind, proc); 1515 record_unwind_protect (start_process_unwind, proc);
1515 1516
1516 pset_childp (XPROCESS (proc), Qt); 1517 pset_childp (XPROCESS (proc), Qt);
1517 pset_plist (XPROCESS (proc), Qnil); 1518 eassert (NILP (XPROCESS (proc)->plist));
1518 pset_type (XPROCESS (proc), Qreal); 1519 pset_type (XPROCESS (proc), Qreal);
1519 pset_buffer (XPROCESS (proc), buffer); 1520 pset_buffer (XPROCESS (proc), buffer);
1520 pset_sentinel (XPROCESS (proc), Fplist_get (contact, QCsentinel)); 1521 pset_sentinel (XPROCESS (proc), Fplist_get (contact, QCsentinel));
@@ -1545,8 +1546,9 @@ usage: (make-process &rest ARGS) */)
1545 1546
1546#ifdef HAVE_GNUTLS 1547#ifdef HAVE_GNUTLS
1547 /* AKA GNUTLS_INITSTAGE(proc). */ 1548 /* AKA GNUTLS_INITSTAGE(proc). */
1548 XPROCESS (proc)->gnutls_initstage = GNUTLS_STAGE_EMPTY; 1549 verify (GNUTLS_STAGE_EMPTY == 0);
1549 pset_gnutls_cred_type (XPROCESS (proc), Qnil); 1550 eassert (XPROCESS (proc)->gnutls_initstage == GNUTLS_STAGE_EMPTY);
1551 eassert (NILP (XPROCESS (proc)->gnutls_cred_type));
1550#endif 1552#endif
1551 1553
1552 XPROCESS (proc)->adaptive_read_buffering 1554 XPROCESS (proc)->adaptive_read_buffering
@@ -1636,7 +1638,7 @@ usage: (make-process &rest ARGS) */)
1636 1638
1637 1639
1638 pset_decoding_buf (XPROCESS (proc), empty_unibyte_string); 1640 pset_decoding_buf (XPROCESS (proc), empty_unibyte_string);
1639 XPROCESS (proc)->decoding_carryover = 0; 1641 eassert (XPROCESS (proc)->decoding_carryover == 0);
1640 pset_encoding_buf (XPROCESS (proc), empty_unibyte_string); 1642 pset_encoding_buf (XPROCESS (proc), empty_unibyte_string);
1641 1643
1642 XPROCESS (proc)->inherit_coding_system_flag 1644 XPROCESS (proc)->inherit_coding_system_flag
@@ -2186,7 +2188,7 @@ usage: (make-pipe-process &rest ARGS) */)
2186 pset_type (p, Qpipe); 2188 pset_type (p, Qpipe);
2187 pset_sentinel (p, Fplist_get (contact, QCsentinel)); 2189 pset_sentinel (p, Fplist_get (contact, QCsentinel));
2188 pset_filter (p, Fplist_get (contact, QCfilter)); 2190 pset_filter (p, Fplist_get (contact, QCfilter));
2189 pset_log (p, Qnil); 2191 eassert (NILP (p->log));
2190 if (tem = Fplist_get (contact, QCnoquery), !NILP (tem)) 2192 if (tem = Fplist_get (contact, QCnoquery), !NILP (tem))
2191 p->kill_without_query = 1; 2193 p->kill_without_query = 1;
2192 if (tem = Fplist_get (contact, QCstop), !NILP (tem)) 2194 if (tem = Fplist_get (contact, QCstop), !NILP (tem))
@@ -2925,7 +2927,7 @@ usage: (make-serial-process &rest ARGS) */)
2925 pset_type (p, Qserial); 2927 pset_type (p, Qserial);
2926 pset_sentinel (p, Fplist_get (contact, QCsentinel)); 2928 pset_sentinel (p, Fplist_get (contact, QCsentinel));
2927 pset_filter (p, Fplist_get (contact, QCfilter)); 2929 pset_filter (p, Fplist_get (contact, QCfilter));
2928 pset_log (p, Qnil); 2930 eassert (NILP (p->log));
2929 if (tem = Fplist_get (contact, QCnoquery), !NILP (tem)) 2931 if (tem = Fplist_get (contact, QCnoquery), !NILP (tem))
2930 p->kill_without_query = 1; 2932 p->kill_without_query = 1;
2931 if (tem = Fplist_get (contact, QCstop), !NILP (tem)) 2933 if (tem = Fplist_get (contact, QCstop), !NILP (tem))
@@ -2979,7 +2981,7 @@ usage: (make-serial-process &rest ARGS) */)
2979 2981
2980 setup_process_coding_systems (proc); 2982 setup_process_coding_systems (proc);
2981 pset_decoding_buf (p, empty_unibyte_string); 2983 pset_decoding_buf (p, empty_unibyte_string);
2982 p->decoding_carryover = 0; 2984 eassert (p->decoding_carryover == 0);
2983 pset_encoding_buf (p, empty_unibyte_string); 2985 pset_encoding_buf (p, empty_unibyte_string);
2984 p->inherit_coding_system_flag 2986 p->inherit_coding_system_flag
2985 = !(!NILP (tem) || NILP (buffer) || !inherit_process_coding_system); 2987 = !(!NILP (tem) || NILP (buffer) || !inherit_process_coding_system);
@@ -3937,14 +3939,14 @@ usage: (make-network-process &rest ARGS) */)
3937 p->kill_without_query = 1; 3939 p->kill_without_query = 1;
3938 if ((tem = Fplist_get (contact, QCstop), !NILP (tem))) 3940 if ((tem = Fplist_get (contact, QCstop), !NILP (tem)))
3939 pset_command (p, Qt); 3941 pset_command (p, Qt);
3940 p->pid = 0; 3942 eassert (p->pid == 0);
3941 p->backlog = 5; 3943 p->backlog = 5;
3942 p->is_non_blocking_client = false; 3944 eassert (! p->is_non_blocking_client);
3943 p->is_server = false; 3945 eassert (! p->is_server);
3944 p->port = port; 3946 p->port = port;
3945 p->socktype = socktype; 3947 p->socktype = socktype;
3946#ifdef HAVE_GETADDRINFO_A 3948#ifdef HAVE_GETADDRINFO_A
3947 p->dns_request = NULL; 3949 eassert (! p->dns_request);
3948#endif 3950#endif
3949#ifdef HAVE_GNUTLS 3951#ifdef HAVE_GNUTLS
3950 tem = Fplist_get (contact, QCtls_parameters); 3952 tem = Fplist_get (contact, QCtls_parameters);
@@ -4614,8 +4616,8 @@ server_accept_connection (Lisp_Object server, int channel)
4614 pset_buffer (p, buffer); 4616 pset_buffer (p, buffer);
4615 pset_sentinel (p, ps->sentinel); 4617 pset_sentinel (p, ps->sentinel);
4616 pset_filter (p, ps->filter); 4618 pset_filter (p, ps->filter);
4617 pset_command (p, Qnil); 4619 eassert (NILP (p->command));
4618 p->pid = 0; 4620 eassert (p->pid == 0);
4619 4621
4620 /* Discard the unwind protect for closing S. */ 4622 /* Discard the unwind protect for closing S. */
4621 specpdl_ptr = specpdl + count; 4623 specpdl_ptr = specpdl + count;
@@ -4645,7 +4647,7 @@ server_accept_connection (Lisp_Object server, int channel)
4645 setup_process_coding_systems (proc); 4647 setup_process_coding_systems (proc);
4646 4648
4647 pset_decoding_buf (p, empty_unibyte_string); 4649 pset_decoding_buf (p, empty_unibyte_string);
4648 p->decoding_carryover = 0; 4650 eassert (p->decoding_carryover == 0);
4649 pset_encoding_buf (p, empty_unibyte_string); 4651 pset_encoding_buf (p, empty_unibyte_string);
4650 4652
4651 p->inherit_coding_system_flag 4653 p->inherit_coding_system_flag