[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r109490: Drop PGET and revert read ac
|
From: |
Dmitry Antipov |
|
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r109490: Drop PGET and revert read access to Lisp_Objects slots of Lisp_Process. |
|
Date: |
Tue, 07 Aug 2012 11:42:34 +0400 |
|
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 109490
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Tue 2012-08-07 11:42:34 +0400
message:
Drop PGET and revert read access to Lisp_Objects slots of Lisp_Process.
* process.h (PGET): Remove.
(struct Lisp_Process): Do not use INTERNAL_FIELD.
* gnutls.c, print.c, process.c, sysdep.c, w32.c, xdisp.c: Adjust users.
modified:
src/ChangeLog
src/print.c
src/process.c
src/process.h
src/sysdep.c
src/w32.c
src/xdisp.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-08-07 07:33:18 +0000
+++ b/src/ChangeLog 2012-08-07 07:42:34 +0000
@@ -1,5 +1,12 @@
2012-08-07 Dmitry Antipov <address@hidden>
+ Drop PGET and revert read access to Lisp_Objects slots of Lisp_Process.
+ * process.h (PGET): Remove.
+ (struct Lisp_Process): Do not use INTERNAL_FIELD.
+ * gnutls.c, print.c, process.c, sysdep.c, w32.c, xdisp.c: Adjust users.
+
+2012-08-07 Dmitry Antipov <address@hidden>
+
Drop WGET and revert read access to Lisp_Objects slots of struct window.
* window.h (WGET): Remove.
(struct window): Do not use INTERNAL_FIELD.
=== modified file 'src/print.c'
--- a/src/print.c 2012-08-07 07:33:18 +0000
+++ b/src/print.c 2012-08-07 07:42:34 +0000
@@ -1697,11 +1697,11 @@
if (escapeflag)
{
strout ("#<process ", -1, -1, printcharfun);
- print_string (PGET (XPROCESS (obj), name), printcharfun);
+ print_string (XPROCESS (obj)->name, printcharfun);
PRINTCHAR ('>');
}
else
- print_string (PGET (XPROCESS (obj), name), printcharfun);
+ print_string (XPROCESS (obj)->name, printcharfun);
}
else if (BOOL_VECTOR_P (obj))
{
=== modified file 'src/process.c'
--- a/src/process.c 2012-08-06 11:16:07 +0000
+++ b/src/process.c 2012-08-07 07:42:34 +0000
@@ -172,10 +172,10 @@
/* QCfilter is defined in keyboard.c. */
extern Lisp_Object QCfilter;
-#define NETCONN_P(p) (EQ (PGET (XPROCESS (p), type), Qnetwork))
-#define NETCONN1_P(p) (EQ (PGET (p, type), Qnetwork))
-#define SERIALCONN_P(p) (EQ (PGET (XPROCESS (p), type), Qserial))
-#define SERIALCONN1_P(p) (EQ (PGET (p, type), Qserial))
+#define NETCONN_P(p) (EQ (XPROCESS (p)->type, Qnetwork))
+#define NETCONN1_P(p) (EQ (p->type, Qnetwork))
+#define SERIALCONN_P(p) (EQ (XPROCESS (p)->type, Qserial))
+#define SERIALCONN1_P(p) (EQ (p->type, Qserial))
#ifndef HAVE_H_ERRNO
extern int h_errno;
@@ -479,7 +479,7 @@
static Lisp_Object
status_message (struct Lisp_Process *p)
{
- Lisp_Object status = PGET (p, status);
+ Lisp_Object status = p->status;
Lisp_Object symbol;
int code, coredump;
Lisp_Object string, string2;
@@ -763,9 +763,9 @@
/* If the process has already signaled, remove it from the list. */
if (p->raw_status_new)
update_status (p);
- symbol = PGET (p, status);
- if (CONSP (PGET (p, status)))
- symbol = XCAR (PGET (p, status));
+ symbol = p->status;
+ if (CONSP (p->status))
+ symbol = XCAR (p->status);
if (EQ (symbol, Qsignal) || EQ (symbol, Qexit))
deleted_pid_list
= Fdelete (make_fixnum_or_float (pid), deleted_pid_list);
@@ -815,14 +815,14 @@
p = XPROCESS (process);
if (p->raw_status_new)
update_status (p);
- status = PGET (p, status);
+ status = p->status;
if (CONSP (status))
status = XCAR (status);
if (NETCONN1_P (p) || SERIALCONN1_P (p))
{
if (EQ (status, Qexit))
status = Qclosed;
- else if (EQ (PGET (p, command), Qt))
+ else if (EQ (p->command, Qt))
status = Qstop;
else if (EQ (status, Qrun))
status = Qopen;
@@ -839,8 +839,8 @@
CHECK_PROCESS (process);
if (XPROCESS (process)->raw_status_new)
update_status (XPROCESS (process));
- if (CONSP (PGET (XPROCESS (process), status)))
- return XCAR (XCDR (PGET (XPROCESS (process), status)));
+ if (CONSP (XPROCESS (process)->status))
+ return XCAR (XCDR (XPROCESS (process)->status));
return make_number (0);
}
@@ -864,7 +864,7 @@
(register Lisp_Object process)
{
CHECK_PROCESS (process);
- return PGET (XPROCESS (process), name);
+ return XPROCESS (process)->name;
}
DEFUN ("process-command", Fprocess_command, Sprocess_command, 1, 1, 0,
@@ -876,7 +876,7 @@
(register Lisp_Object process)
{
CHECK_PROCESS (process);
- return PGET (XPROCESS (process), command);
+ return XPROCESS (process)->command;
}
DEFUN ("process-tty-name", Fprocess_tty_name, Sprocess_tty_name, 1, 1, 0,
@@ -886,7 +886,7 @@
(register Lisp_Object process)
{
CHECK_PROCESS (process);
- return PGET (XPROCESS (process), tty_name);
+ return XPROCESS (process)->tty_name;
}
DEFUN ("set-process-buffer", Fset_process_buffer, Sset_process_buffer,
@@ -903,7 +903,7 @@
p = XPROCESS (process);
PSET (p, buffer, buffer);
if (NETCONN1_P (p) || SERIALCONN1_P (p))
- PSET (p, childp, Fplist_put (PGET (p, childp), QCbuffer, buffer));
+ PSET (p, childp, Fplist_put (p->childp, QCbuffer, buffer));
setup_process_coding_systems (process);
return buffer;
}
@@ -915,7 +915,7 @@
(register Lisp_Object process)
{
CHECK_PROCESS (process);
- return PGET (XPROCESS (process), buffer);
+ return XPROCESS (process)->buffer;
}
DEFUN ("process-mark", Fprocess_mark, Sprocess_mark,
@@ -924,7 +924,7 @@
(register Lisp_Object process)
{
CHECK_PROCESS (process);
- return PGET (XPROCESS (process), mark);
+ return XPROCESS (process)->mark;
}
DEFUN ("set-process-filter", Fset_process_filter, Sset_process_filter,
@@ -960,14 +960,14 @@
if (p->infd >= 0)
{
- if (EQ (filter, Qt) && !EQ (PGET (p, status), Qlisten))
+ if (EQ (filter, Qt) && !EQ (p->status, Qlisten))
{
FD_CLR (p->infd, &input_wait_mask);
FD_CLR (p->infd, &non_keyboard_wait_mask);
}
- else if (EQ (PGET (p, filter), Qt)
+ else if (EQ (p->filter, Qt)
/* Network or serial process not stopped: */
- && !EQ (PGET (p, command), Qt))
+ && !EQ (p->command, Qt))
{
FD_SET (p->infd, &input_wait_mask);
FD_SET (p->infd, &non_keyboard_wait_mask);
@@ -976,7 +976,7 @@
PSET (p, filter, filter);
if (NETCONN1_P (p) || SERIALCONN1_P (p))
- PSET (p, childp, Fplist_put (PGET (p, childp), QCfilter, filter));
+ PSET (p, childp, Fplist_put (p->childp, QCfilter, filter));
setup_process_coding_systems (process);
return filter;
}
@@ -988,7 +988,7 @@
(register Lisp_Object process)
{
CHECK_PROCESS (process);
- return PGET (XPROCESS (process), filter);
+ return XPROCESS (process)->filter;
}
DEFUN ("set-process-sentinel", Fset_process_sentinel, Sset_process_sentinel,
@@ -1005,7 +1005,7 @@
PSET (p, sentinel, sentinel);
if (NETCONN1_P (p) || SERIALCONN1_P (p))
- PSET (p, childp, Fplist_put (PGET (p, childp), QCsentinel, sentinel));
+ PSET (p, childp, Fplist_put (p->childp, QCsentinel, sentinel));
return sentinel;
}
@@ -1016,7 +1016,7 @@
(register Lisp_Object process)
{
CHECK_PROCESS (process);
- return PGET (XPROCESS (process), sentinel);
+ return XPROCESS (process)->sentinel;
}
DEFUN ("set-process-window-size", Fset_process_window_size,
@@ -1101,7 +1101,7 @@
Lisp_Object contact;
CHECK_PROCESS (process);
- contact = PGET (XPROCESS (process), childp);
+ contact = XPROCESS (process)->childp;
#ifdef DATAGRAM_SOCKETS
if (DATAGRAM_CONN_P (process)
@@ -1127,7 +1127,7 @@
(register Lisp_Object process)
{
CHECK_PROCESS (process);
- return PGET (XPROCESS (process), plist);
+ return XPROCESS (process)->plist;
}
DEFUN ("set-process-plist", Fset_process_plist, Sset_process_plist,
@@ -1150,7 +1150,7 @@
a socket connection. */)
(Lisp_Object process)
{
- return PGET (XPROCESS (process), type);
+ return XPROCESS (process)->type;
}
#endif
@@ -1163,7 +1163,7 @@
{
Lisp_Object proc;
proc = get_process (process);
- return PGET (XPROCESS (proc), type);
+ return XPROCESS (proc)->type;
}
DEFUN ("format-network-address", Fformat_network_address,
Sformat_network_address,
@@ -1346,7 +1346,7 @@
/* Make the process marker point into the process buffer (if any). */
if (BUFFERP (buffer))
- set_marker_both (PGET (XPROCESS (proc), mark), buffer,
+ set_marker_both (XPROCESS (proc)->mark, buffer,
BUF_ZV (XBUFFER (buffer)),
BUF_ZV_BYTE (XBUFFER (buffer)));
@@ -1464,7 +1464,7 @@
{
if (NILP (arg_encoding))
arg_encoding = (complement_process_encoding_system
- (PGET (XPROCESS (proc),
encode_coding_system)));
+ (XPROCESS (proc)->encode_coding_system));
XSETCAR (tem,
code_convert_string_norecord
(XCAR (tem), arg_encoding, 1));
@@ -2368,7 +2368,7 @@
if (set_socket_option (s, option, value))
{
- PSET (p, childp, Fplist_put (PGET (p, childp), option, value));
+ PSET (p, childp, Fplist_put (p->childp, option, value));
return Qt;
}
@@ -2457,10 +2457,10 @@
proc = Fplist_get (contact, QCport);
proc = get_process (proc);
p = XPROCESS (proc);
- if (!EQ (PGET (p, type), Qserial))
+ if (!EQ (p->type, Qserial))
error ("Not a serial process");
- if (NILP (Fplist_get (PGET (p, childp), QCspeed)))
+ if (NILP (Fplist_get (p->childp, QCspeed)))
{
UNGCPRO;
return Qnil;
@@ -2615,7 +2615,7 @@
PSET (p, command, Qt);
p->pty_flag = 0;
- if (!EQ (PGET (p, command), Qt))
+ if (!EQ (p->command, Qt))
{
FD_SET (fd, &input_wait_mask);
FD_SET (fd, &non_keyboard_wait_mask);
@@ -2623,7 +2623,7 @@
if (BUFFERP (buffer))
{
- set_marker_both (PGET (p, mark), buffer,
+ set_marker_both (p->mark, buffer,
BUF_ZV (XBUFFER (buffer)),
BUF_ZV_BYTE (XBUFFER (buffer)));
}
@@ -3420,7 +3420,7 @@
/* Make the process marker point into the process buffer (if any). */
if (BUFFERP (buffer))
- set_marker_both (PGET (p, mark), buffer,
+ set_marker_both (p->mark, buffer,
BUF_ZV (XBUFFER (buffer)),
BUF_ZV_BYTE (XBUFFER (buffer)));
@@ -3442,8 +3442,8 @@
#endif
/* A server may have a client filter setting of Qt, but it must
still listen for incoming connects unless it is stopped. */
- if ((!EQ (PGET (p, filter), Qt) && !EQ (PGET (p, command), Qt))
- || (EQ (PGET (p, status), Qlisten) && NILP (PGET (p, command))))
+ if ((!EQ (p->filter, Qt) && !EQ (p->command, Qt))
+ || (EQ (p->status, Qlisten) && NILP (p->command)))
{
FD_SET (inch, &input_wait_mask);
FD_SET (inch, &non_keyboard_wait_mask);
@@ -4030,8 +4030,8 @@
return;
#endif
- if (!NILP (PGET (ps, log)))
- call3 (PGET (ps, log), server, Qnil,
+ if (!NILP (ps->log))
+ call3 (ps->log, server, Qnil,
concat3 (build_string ("accept failed with code"),
Fnumber_to_string (make_number (code)),
build_string ("\n")));
@@ -4101,15 +4101,15 @@
process name of the server process concatenated with the caller
identification. */
- if (!NILP (PGET (ps, filter)) && !EQ (PGET (ps, filter), Qt))
+ if (!NILP (ps->filter) && !EQ (ps->filter, Qt))
buffer = Qnil;
else
{
- buffer = PGET (ps, buffer);
+ buffer = ps->buffer;
if (!NILP (buffer))
buffer = Fbuffer_name (buffer);
else
- buffer = PGET (ps, name);
+ buffer = ps->name;
if (!NILP (buffer))
{
buffer = concat2 (buffer, caller);
@@ -4120,7 +4120,7 @@
/* Generate a unique name for the new server process. Combine the
server process name with the caller identification. */
- name = concat2 (PGET (ps, name), caller);
+ name = concat2 (ps->name, caller);
proc = make_process (name);
chan_process[s] = proc;
@@ -4136,7 +4136,7 @@
p = XPROCESS (proc);
/* Build new contact information for this setup. */
- contact = Fcopy_sequence (PGET (ps, childp));
+ contact = Fcopy_sequence (ps->childp);
contact = Fplist_put (contact, QCserver, Qnil);
contact = Fplist_put (contact, QChost, host);
if (!NILP (service))
@@ -4151,12 +4151,12 @@
#endif
PSET (p, childp, contact);
- PSET (p, plist, Fcopy_sequence (PGET (ps, plist)));
+ PSET (p, plist, Fcopy_sequence (ps->plist));
PSET (p, type, Qnetwork);
PSET (p, buffer, buffer);
- PSET (p, sentinel, PGET (ps, sentinel));
- PSET (p, filter, PGET (ps, filter));
+ PSET (p, sentinel, ps->sentinel);
+ PSET (p, filter, ps->filter);
PSET (p, command, Qnil);
p->pid = 0;
p->infd = s;
@@ -4164,7 +4164,7 @@
PSET (p, status, Qrun);
/* Client processes for accepted connections are not stopped initially. */
- if (!EQ (PGET (p, filter), Qt))
+ if (!EQ (p->filter, Qt))
{
FD_SET (s, &input_wait_mask);
FD_SET (s, &non_keyboard_wait_mask);
@@ -4178,8 +4178,8 @@
of the new process should reflect the settings at the time the
server socket was opened; not the current settings. */
- PSET (p, decode_coding_system, PGET (ps, decode_coding_system));
- PSET (p, encode_coding_system, PGET (ps, encode_coding_system));
+ PSET (p, decode_coding_system, ps->decode_coding_system);
+ PSET (p, encode_coding_system, ps->encode_coding_system);
setup_process_coding_systems (proc);
PSET (p, decoding_buf, empty_unibyte_string);
@@ -4189,13 +4189,13 @@
p->inherit_coding_system_flag
= (NILP (buffer) ? 0 : ps->inherit_coding_system_flag);
- if (!NILP (PGET (ps, log)))
- call3 (PGET (ps, log), server, proc,
+ if (!NILP (ps->log))
+ call3 (ps->log, server, proc,
concat3 (build_string ("accept from "),
(STRINGP (host) ? host : build_string ("-")),
build_string ("\n")));
- if (!NILP (PGET (p, sentinel)))
+ if (!NILP (p->sentinel))
exec_sentinel (proc,
concat3 (build_string ("open from "),
(STRINGP (host) ? host : build_string ("-")),
@@ -4286,8 +4286,8 @@
FD_ZERO (&Writeok);
if (time_limit == 0 && nsecs == 0 && wait_proc && !NILP (Vinhibit_quit)
- && !(CONSP (PGET (wait_proc, status))
- && EQ (XCAR (PGET (wait_proc, status)), Qexit)))
+ && !(CONSP (wait_proc->status)
+ && EQ (XCAR (wait_proc->status), Qexit)))
message ("Blocking call to accept-process-output with quit inhibited!!");
/* If wait_proc is a process to watch, set wait_channel accordingly. */
@@ -4460,8 +4460,8 @@
if (wait_proc && wait_proc->raw_status_new)
update_status (wait_proc);
if (wait_proc
- && ! EQ (PGET (wait_proc, status), Qrun)
- && ! EQ (PGET (wait_proc, status), Qconnect))
+ && ! EQ (wait_proc->status, Qrun)
+ && ! EQ (wait_proc->status, Qconnect))
{
int nread, total_nread = 0;
@@ -4820,7 +4820,7 @@
continue;
/* If this is a server stream socket, accept connection. */
- if (EQ (PGET (XPROCESS (proc), status), Qlisten))
+ if (EQ (XPROCESS (proc)->status, Qlisten))
{
server_accept_connection (proc, channel);
continue;
@@ -4908,7 +4908,7 @@
deactivate_process (proc);
if (XPROCESS (proc)->raw_status_new)
update_status (XPROCESS (proc));
- if (EQ (PGET (XPROCESS (proc), status), Qrun))
+ if (EQ (XPROCESS (proc)->status, Qrun))
PSET (XPROCESS (proc), status,
Fcons (Qexit, Fcons (make_number (256), Qnil)));
}
@@ -4969,7 +4969,7 @@
status_notify to do it later, it will read input
from the process before calling the sentinel. */
exec_sentinel (proc, build_string ("open\n"));
- if (!EQ (PGET (p, filter), Qt) && !EQ (PGET (p, command), Qt))
+ if (!EQ (p->filter, Qt) && !EQ (p->command, Qt))
{
FD_SET (p->infd, &input_wait_mask);
FD_SET (p->infd, &non_keyboard_wait_mask);
@@ -5041,7 +5041,7 @@
chars = alloca (carryover + readmax);
if (carryover)
/* See the comment above. */
- memcpy (chars, SDATA (PGET (p, decoding_buf)), carryover);
+ memcpy (chars, SDATA (p->decoding_buf), carryover);
#ifdef DATAGRAM_SOCKETS
/* We have a working select, so proc_buffered_char is always -1. */
@@ -5120,7 +5120,7 @@
record_unwind_protect (set_buffer_if_live, Fcurrent_buffer ());
/* Read and dispose of the process output. */
- outstream = PGET (p, filter);
+ outstream = p->filter;
if (!NILP (outstream))
{
Lisp_Object text;
@@ -5162,7 +5162,7 @@
text = coding->dst_object;
Vlast_coding_system_used = CODING_ID_NAME (coding->id);
/* A new coding system might be found. */
- if (!EQ (PGET (p, decode_coding_system), Vlast_coding_system_used))
+ if (!EQ (p->decode_coding_system, Vlast_coding_system_used))
{
PSET (p, decode_coding_system, Vlast_coding_system_used);
@@ -5177,21 +5177,21 @@
proc_encode_coding_system[p->outfd] surely points to a
valid memory because p->outfd will be changed once EOF is
sent to the process. */
- if (NILP (PGET (p, encode_coding_system))
+ if (NILP (p->encode_coding_system)
&& proc_encode_coding_system[p->outfd])
{
PSET (p, encode_coding_system,
- coding_inherit_eol_type (Vlast_coding_system_used, Qnil));
- setup_coding_system (PGET (p, encode_coding_system),
+ coding_inherit_eol_type (Vlast_coding_system_used, Qnil));
+ setup_coding_system (p->encode_coding_system,
proc_encode_coding_system[p->outfd]);
}
}
if (coding->carryover_bytes > 0)
{
- if (SCHARS (PGET (p, decoding_buf)) < coding->carryover_bytes)
+ if (SCHARS (p->decoding_buf) < coding->carryover_bytes)
PSET (p, decoding_buf, make_uninit_string
(coding->carryover_bytes));
- memcpy (SDATA (PGET (p, decoding_buf)), coding->carryover,
+ memcpy (SDATA (p->decoding_buf), coding->carryover,
coding->carryover_bytes);
p->decoding_carryover = coding->carryover_bytes;
}
@@ -5227,7 +5227,7 @@
}
/* If no filter, write into buffer if it isn't dead. */
- else if (!NILP (PGET (p, buffer)) && !NILP (BVAR (XBUFFER (PGET (p,
buffer)), name)))
+ else if (!NILP (p->buffer) && !NILP (BVAR (XBUFFER (p->buffer), name)))
{
Lisp_Object old_read_only;
ptrdiff_t old_begv, old_zv;
@@ -5237,7 +5237,7 @@
Lisp_Object text;
struct buffer *b;
- Fset_buffer (PGET (p, buffer));
+ Fset_buffer (p->buffer);
opoint = PT;
opoint_byte = PT_BYTE;
old_read_only = BVAR (current_buffer, read_only);
@@ -5251,11 +5251,11 @@
/* Insert new output into buffer
at the current end-of-output marker,
thus preserving logical ordering of input and output. */
- if (XMARKER (PGET (p, mark))->buffer)
+ if (XMARKER (p->mark)->buffer)
SET_PT_BOTH (clip_to_bounds (BEGV,
- marker_position (PGET (p, mark)), ZV),
+ marker_position (p->mark), ZV),
clip_to_bounds (BEGV_BYTE,
- marker_byte_position (PGET (p, mark)),
+ marker_byte_position (p->mark),
ZV_BYTE));
else
SET_PT_BOTH (ZV, ZV_BYTE);
@@ -5272,23 +5272,23 @@
Vlast_coding_system_used = CODING_ID_NAME (coding->id);
/* A new coding system might be found. See the comment in the
similar code in the previous `if' block. */
- if (!EQ (PGET (p, decode_coding_system), Vlast_coding_system_used))
+ if (!EQ (p->decode_coding_system, Vlast_coding_system_used))
{
PSET (p, decode_coding_system, Vlast_coding_system_used);
- if (NILP (PGET (p, encode_coding_system))
+ if (NILP (p->encode_coding_system)
&& proc_encode_coding_system[p->outfd])
{
PSET (p, encode_coding_system,
- coding_inherit_eol_type (Vlast_coding_system_used, Qnil));
- setup_coding_system (PGET (p, encode_coding_system),
+ coding_inherit_eol_type (Vlast_coding_system_used, Qnil));
+ setup_coding_system (p->encode_coding_system,
proc_encode_coding_system[p->outfd]);
}
}
if (coding->carryover_bytes > 0)
{
- if (SCHARS (PGET (p, decoding_buf)) < coding->carryover_bytes)
+ if (SCHARS (p->decoding_buf) < coding->carryover_bytes)
PSET (p, decoding_buf, make_uninit_string
(coding->carryover_bytes));
- memcpy (SDATA (PGET (p, decoding_buf)), coding->carryover,
+ memcpy (SDATA (p->decoding_buf), coding->carryover,
coding->carryover_bytes);
p->decoding_carryover = coding->carryover_bytes;
}
@@ -5306,11 +5306,11 @@
/* Make sure the process marker's position is valid when the
process buffer is changed in the signal_after_change above.
W3 is known to do that. */
- if (BUFFERP (PGET (p, buffer))
- && (b = XBUFFER (PGET (p, buffer)), b != current_buffer))
- set_marker_both (PGET (p, mark), PGET (p, buffer), BUF_PT (b),
BUF_PT_BYTE (b));
+ if (BUFFERP (p->buffer)
+ && (b = XBUFFER (p->buffer), b != current_buffer))
+ set_marker_both (p->mark, p->buffer, BUF_PT (b), BUF_PT_BYTE (b));
else
- set_marker_both (PGET (p, mark), PGET (p, buffer), PT, PT_BYTE);
+ set_marker_both (p->mark, p->buffer, PT, PT_BYTE);
update_mode_lines++;
@@ -5404,9 +5404,9 @@
entry = Fcons (obj, Fcons (make_number (offset), make_number (len)));
if (front)
- PSET (p, write_queue, Fcons (entry, PGET (p, write_queue)));
+ PSET (p, write_queue, Fcons (entry, p->write_queue));
else
- PSET (p, write_queue, nconc2 (PGET (p, write_queue), Fcons (entry, Qnil)));
+ PSET (p, write_queue, nconc2 (p->write_queue, Fcons (entry, Qnil)));
}
/* Remove the first element in the write_queue of process P, put its
@@ -5420,11 +5420,11 @@
Lisp_Object entry, offset_length;
ptrdiff_t offset;
- if (NILP (PGET (p, write_queue)))
+ if (NILP (p->write_queue))
return 0;
- entry = XCAR (PGET (p, write_queue));
- PSET (p, write_queue, XCDR (PGET (p, write_queue)));
+ entry = XCAR (p->write_queue);
+ PSET (p, write_queue, XCDR (p->write_queue));
*obj = XCAR (entry);
offset_length = XCDR (entry);
@@ -5458,10 +5458,10 @@
if (p->raw_status_new)
update_status (p);
- if (! EQ (PGET (p, status), Qrun))
- error ("Process %s not running", SDATA (PGET (p, name)));
+ if (! EQ (p->status, Qrun))
+ error ("Process %s not running", SDATA (p->name));
if (p->outfd < 0)
- error ("Output file descriptor of %s is closed", SDATA (PGET (p, name)));
+ error ("Output file descriptor of %s is closed", SDATA (p->name));
coding = proc_encode_coding_system[p->outfd];
Vlast_coding_system_used = CODING_ID_NAME (coding->id);
@@ -5472,8 +5472,8 @@
|| EQ (object, Qt))
{
PSET (p, encode_coding_system,
- complement_process_encoding_system (PGET (p,
encode_coding_system)));
- if (!EQ (Vlast_coding_system_used, PGET (p, encode_coding_system)))
+ complement_process_encoding_system (p->encode_coding_system));
+ if (!EQ (Vlast_coding_system_used, p->encode_coding_system))
{
/* The coding system for encoding was changed to raw-text
because we sent a unibyte text previously. Now we are
@@ -5483,8 +5483,8 @@
Another reason we come here is that the coding system
was just complemented and a new one was returned by
complement_process_encoding_system. */
- setup_coding_system (PGET (p, encode_coding_system), coding);
- Vlast_coding_system_used = PGET (p, encode_coding_system);
+ setup_coding_system (p->encode_coding_system, coding);
+ Vlast_coding_system_used = p->encode_coding_system;
}
coding->src_multibyte = 1;
}
@@ -5571,7 +5571,7 @@
/* If there is already data in the write_queue, put the new data
in the back of queue. Otherwise, ignore it. */
- if (!NILP (PGET (p, write_queue)))
+ if (!NILP (p->write_queue))
write_queue_push (p, object, buf, len, 0);
do /* while !NILP (p->write_queue) */
@@ -5685,7 +5685,7 @@
cur_len -= written;
}
}
- while (!NILP (PGET (p, write_queue)));
+ while (!NILP (p->write_queue));
}
else
{
@@ -5696,7 +5696,7 @@
PSET (p, status, Fcons (Qexit, Fcons (make_number (256), Qnil)));
p->tick = ++process_tick;
deactivate_process (proc);
- error ("SIGPIPE raised on process %s; closed it", SDATA (PGET (p,
name)));
+ error ("SIGPIPE raised on process %s; closed it", SDATA (p->name));
}
}
@@ -5754,12 +5754,12 @@
pid_t gid = -1;
#ifdef TIOCGPGRP
- if (ioctl (p->infd, TIOCGPGRP, &gid) == -1 && ! NILP (PGET (p, tty_name)))
+ if (ioctl (p->infd, TIOCGPGRP, &gid) == -1 && ! NILP (p->tty_name))
{
int fd;
/* Some OS:es (Solaris 8/9) does not allow TIOCGPGRP from the
master side. Try the slave side. */
- fd = emacs_open (SSDATA (PGET (p, tty_name)), O_RDONLY, 0);
+ fd = emacs_open (SSDATA (p->tty_name), O_RDONLY, 0);
if (fd != -1)
{
@@ -5788,12 +5788,12 @@
proc = get_process (process);
p = XPROCESS (proc);
- if (!EQ (PGET (p, type), Qreal))
+ if (!EQ (p->type, Qreal))
error ("Process %s is not a subprocess",
- SDATA (PGET (p, name)));
+ SDATA (p->name));
if (p->infd < 0)
error ("Process %s is not active",
- SDATA (PGET (p, name)));
+ SDATA (p->name));
gid = emacs_get_tty_pgrp (p);
@@ -5828,12 +5828,12 @@
proc = get_process (process);
p = XPROCESS (proc);
- if (!EQ (PGET (p, type), Qreal))
+ if (!EQ (p->type, Qreal))
error ("Process %s is not a subprocess",
- SDATA (PGET (p, name)));
+ SDATA (p->name));
if (p->infd < 0)
error ("Process %s is not active",
- SDATA (PGET (p, name)));
+ SDATA (p->name));
if (!p->pty_flag)
current_group = Qnil;
@@ -6012,7 +6012,7 @@
struct Lisp_Process *p;
p = XPROCESS (process);
- if (NILP (PGET (p, command))
+ if (NILP (p->command)
&& p->infd >= 0)
{
FD_CLR (p->infd, &input_wait_mask);
@@ -6041,9 +6041,9 @@
struct Lisp_Process *p;
p = XPROCESS (process);
- if (EQ (PGET (p, command), Qt)
+ if (EQ (p->command, Qt)
&& p->infd >= 0
- && (!EQ (PGET (p, filter), Qt) || EQ (PGET (p, status), Qlisten)))
+ && (!EQ (p->filter, Qt) || EQ (p->status, Qlisten)))
{
FD_SET (p->infd, &input_wait_mask);
FD_SET (p->infd, &non_keyboard_wait_mask);
@@ -6101,8 +6101,7 @@
CHECK_PROCESS (process);
pid = XPROCESS (process)->pid;
if (pid <= 0)
- error ("Cannot signal process %s",
- SDATA (PGET (XPROCESS (process), name)));
+ error ("Cannot signal process %s", SDATA (XPROCESS (process)->name));
}
#define parse_signal(NAME, VALUE) \
@@ -6246,8 +6245,8 @@
/* Make sure the process is really alive. */
if (XPROCESS (proc)->raw_status_new)
update_status (XPROCESS (proc));
- if (! EQ (PGET (XPROCESS (proc), status), Qrun))
- error ("Process %s not running", SDATA (PGET (XPROCESS (proc), name)));
+ if (! EQ (XPROCESS (proc)->status, Qrun))
+ error ("Process %s not running", SDATA (XPROCESS (proc)->name));
if (CODING_REQUIRE_FLUSHING (coding))
{
@@ -6257,7 +6256,7 @@
if (XPROCESS (proc)->pty_flag)
send_process (proc, "\004", 1, Qnil);
- else if (EQ (PGET (XPROCESS (proc), type), Qserial))
+ else if (EQ (XPROCESS (proc)->type, Qserial))
{
#ifndef WINDOWSNT
if (tcdrain (XPROCESS (proc)->outfd) != 0)
@@ -6274,7 +6273,7 @@
for communication with the subprocess, call shutdown to cause EOF.
(In some old system, shutdown to socketpair doesn't work.
Then we just can't win.) */
- if (EQ (PGET (XPROCESS (proc), type), Qnetwork)
+ if (EQ (XPROCESS (proc)->type, Qnetwork)
|| XPROCESS (proc)->outfd == XPROCESS (proc)->infd)
shutdown (XPROCESS (proc)->outfd, 1);
/* In case of socketpair, outfd == infd, so don't close it. */
@@ -6387,7 +6386,7 @@
{
proc = XCDR (XCAR (tail));
p = XPROCESS (proc);
- if (EQ (PGET (p, type), Qreal) && p->pid == pid)
+ if (EQ (p->type, Qreal) && p->pid == pid)
break;
p = 0;
}
@@ -6511,7 +6510,7 @@
friends don't expect current-buffer to be changed from under them. */
record_unwind_protect (set_buffer_if_live, Fcurrent_buffer ());
- sentinel = PGET (p, sentinel);
+ sentinel = p->sentinel;
if (NILP (sentinel))
return;
@@ -6605,16 +6604,16 @@
p->update_tick = p->tick;
/* If process is still active, read any output that remains. */
- while (! EQ (PGET (p, filter), Qt)
- && ! EQ (PGET (p, status), Qconnect)
- && ! EQ (PGET (p, status), Qlisten)
+ while (! EQ (p->filter, Qt)
+ && ! EQ (p->status, Qconnect)
+ && ! EQ (p->status, Qlisten)
/* Network or serial process not stopped: */
- && ! EQ (PGET (p, command), Qt)
+ && ! EQ (p->command, Qt)
&& p->infd >= 0
&& p != deleting_process
&& read_process_output (proc, p->infd) > 0);
- buffer = PGET (p, buffer);
+ buffer = p->buffer;
/* Get the text to use for the message. */
if (p->raw_status_new)
@@ -6622,9 +6621,9 @@
msg = status_message (p);
/* If process is terminated, deactivate it or delete it. */
- symbol = PGET (p, status);
- if (CONSP (PGET (p, status)))
- symbol = XCAR (PGET (p, status));
+ symbol = p->status;
+ if (CONSP (p->status))
+ symbol = XCAR (p->status);
if (EQ (symbol, Qsignal) || EQ (symbol, Qexit)
|| EQ (symbol, Qclosed))
@@ -6641,7 +6640,7 @@
this code to be run again. */
p->update_tick = p->tick;
/* Now output the message suitably. */
- if (!NILP (PGET (p, sentinel)))
+ if (!NILP (p->sentinel))
exec_sentinel (proc, msg);
/* Don't bother with a message in the buffer
when a process becomes runnable. */
@@ -6663,8 +6662,8 @@
/* Insert new output into buffer
at the current end-of-output marker,
thus preserving logical ordering of input and output. */
- if (XMARKER (PGET (p, mark))->buffer)
- Fgoto_char (PGET (p, mark));
+ if (XMARKER (p->mark)->buffer)
+ Fgoto_char (p->mark);
else
SET_PT_BOTH (ZV, ZV_BYTE);
@@ -6675,11 +6674,11 @@
BVAR (current_buffer, read_only) = Qnil;
insert_string ("\nProcess ");
{ /* FIXME: temporary kludge */
- Lisp_Object tem2 = PGET (p, name); Finsert (1, &tem2); }
+ Lisp_Object tem2 = p->name; Finsert (1, &tem2); }
insert_string (" ");
Finsert (1, &msg);
BVAR (current_buffer, read_only) = tem;
- set_marker_both (PGET (p, mark), PGET (p, buffer), PT, PT_BYTE);
+ set_marker_both (p->mark, p->buffer, PT, PT_BYTE);
if (opoint >= before)
SET_PT_BOTH (opoint + (PT - before),
@@ -6709,9 +6708,9 @@
CHECK_PROCESS (process);
p = XPROCESS (process);
if (p->infd < 0)
- error ("Input file descriptor of %s closed", SDATA (PGET (p, name)));
+ error ("Input file descriptor of %s closed", SDATA (p->name));
if (p->outfd < 0)
- error ("Output file descriptor of %s closed", SDATA (PGET (p, name)));
+ error ("Output file descriptor of %s closed", SDATA (p->name));
Fcheck_coding_system (decoding);
Fcheck_coding_system (encoding);
encoding = coding_inherit_eol_type (encoding, Qnil);
@@ -6728,8 +6727,8 @@
(register Lisp_Object process)
{
CHECK_PROCESS (process);
- return Fcons (PGET (XPROCESS (process), decode_coding_system),
- PGET (XPROCESS (process), encode_coding_system));
+ return Fcons (XPROCESS (process)->decode_coding_system,
+ XPROCESS (process)->encode_coding_system);
}
DEFUN ("set-process-filter-multibyte", Fset_process_filter_multibyte,
@@ -6747,7 +6746,7 @@
p = XPROCESS (process);
if (NILP (flag))
PSET (p, decode_coding_system,
- raw_text_coding_system (PGET (p, decode_coding_system)));
+ raw_text_coding_system (p->decode_coding_system));
setup_process_coding_systems (process);
return Qnil;
@@ -7085,19 +7084,19 @@
if (!proc_decode_coding_system[inch])
proc_decode_coding_system[inch] = xmalloc (sizeof (struct coding_system));
- coding_system = PGET (p, decode_coding_system);
- if (! NILP (PGET (p, filter)))
+ coding_system = p->decode_coding_system;
+ if (! NILP (p->filter))
;
- else if (BUFFERP (PGET (p, buffer)))
+ else if (BUFFERP (p->buffer))
{
- if (NILP (BVAR (XBUFFER (PGET (p, buffer)),
enable_multibyte_characters)))
+ if (NILP (BVAR (XBUFFER (p->buffer), enable_multibyte_characters)))
coding_system = raw_text_coding_system (coding_system);
}
setup_coding_system (coding_system, proc_decode_coding_system[inch]);
if (!proc_encode_coding_system[outch])
proc_encode_coding_system[outch] = xmalloc (sizeof (struct coding_system));
- setup_coding_system (PGET (p, encode_coding_system),
+ setup_coding_system (p->encode_coding_system,
proc_encode_coding_system[outch]);
#endif
}
@@ -7143,7 +7142,7 @@
for (tail = Vprocess_alist; CONSP (tail); tail = XCDR (tail))
{
proc = Fcdr (XCAR (tail));
- if (PROCESSP (proc) && EQ (PGET (XPROCESS (proc), buffer), buf))
+ if (PROCESSP (proc) && EQ (XPROCESS (proc)->buffer, buf))
return proc;
}
#endif /* subprocesses */
@@ -7182,7 +7181,7 @@
{
proc = XCDR (XCAR (tail));
if (PROCESSP (proc)
- && (NILP (buffer) || EQ (PGET (XPROCESS (proc), buffer), buffer)))
+ && (NILP (buffer) || EQ (XPROCESS (proc)->buffer, buffer)))
{
if (NETCONN_P (proc) || SERIALCONN_P (proc))
Fdelete_process (proc);
=== modified file 'src/process.h'
--- a/src/process.h 2012-08-06 11:16:07 +0000
+++ b/src/process.h 2012-08-07 07:42:34 +0000
@@ -26,15 +26,10 @@
#include "gnutls.h"
#endif
-/* Most code should use these macros to access Lisp fields in
- struct Lisp_Process. PGET should not be used as lvalue. */
-
-#define PGET(p, field) \
- (eassert (offsetof (struct Lisp_Process, field ## _) \
- < offsetof (struct Lisp_Process, pid)), \
- ((p)->INTERNAL_FIELD (field)))
-
-#define PSET(p, field, value) ((p)->INTERNAL_FIELD (field) = (value))
+/* Most code should use these macros to set
+ Lisp fields in struct Lisp_Process. */
+
+#define PSET(p, field, value) ((p)->field = (value))
/* This structure records information about a subprocess
or network connection. */
@@ -44,68 +39,68 @@
struct vectorlike_header header;
/* Name of subprocess terminal. */
- Lisp_Object INTERNAL_FIELD (tty_name);
+ Lisp_Object tty_name;
/* Name of this process */
- Lisp_Object INTERNAL_FIELD (name);
+ Lisp_Object name;
/* List of command arguments that this process was run with.
Is set to t for a stopped network process; nil otherwise. */
- Lisp_Object INTERNAL_FIELD (command);
+ Lisp_Object command;
/* (funcall FILTER PROC STRING) (if FILTER is non-nil)
to dispose of a bunch of chars from the process all at once */
- Lisp_Object INTERNAL_FIELD (filter);
+ Lisp_Object filter;
/* (funcall SENTINEL PROCESS) when process state changes */
- Lisp_Object INTERNAL_FIELD (sentinel);
+ Lisp_Object sentinel;
/* (funcall LOG SERVER CLIENT MESSAGE) when a server process
accepts a connection from a client. */
- Lisp_Object INTERNAL_FIELD (log);
+ Lisp_Object log;
/* Buffer that output is going to */
- Lisp_Object INTERNAL_FIELD (buffer);
+ Lisp_Object buffer;
/* t if this is a real child process. For a network or serial
connection, it is a plist based on the arguments to
make-network-process or make-serial-process. */
- Lisp_Object INTERNAL_FIELD (childp);
+ Lisp_Object childp;
/* Plist for programs to keep per-process state information, parameters,
etc. */
- Lisp_Object INTERNAL_FIELD (plist);
+ Lisp_Object plist;
/* Symbol indicating the type of process: real, network, serial */
- Lisp_Object INTERNAL_FIELD (type);
+ Lisp_Object type;
/* Marker set to end of last buffer-inserted output from this process */
- Lisp_Object INTERNAL_FIELD (mark);
+ Lisp_Object mark;
/* Symbol indicating status of process.
This may be a symbol: run, open, or closed.
Or it may be a list, whose car is stop, exit or signal
and whose cdr is a pair (EXIT_CODE . COREDUMP_FLAG)
or (SIGNAL_NUMBER . COREDUMP_FLAG). */
- Lisp_Object INTERNAL_FIELD (status);
+ Lisp_Object status;
/* Coding-system for decoding the input from this process. */
- Lisp_Object INTERNAL_FIELD (decode_coding_system);
+ Lisp_Object decode_coding_system;
/* Working buffer for decoding. */
- Lisp_Object INTERNAL_FIELD (decoding_buf);
+ Lisp_Object decoding_buf;
/* Coding-system for encoding the output to this process. */
- Lisp_Object INTERNAL_FIELD (encode_coding_system);
+ Lisp_Object encode_coding_system;
/* Working buffer for encoding. */
- Lisp_Object INTERNAL_FIELD (encoding_buf);
+ Lisp_Object encoding_buf;
/* Queue for storing waiting writes */
- Lisp_Object INTERNAL_FIELD (write_queue);
+ Lisp_Object write_queue;
#ifdef HAVE_GNUTLS
- Lisp_Object INTERNAL_FIELD (gnutls_cred_type);
+ Lisp_Object gnutls_cred_type;
#endif
/* After this point, there are no Lisp_Objects any more. */
=== modified file 'src/sysdep.c'
--- a/src/sysdep.c 2012-08-06 20:29:45 +0000
+++ b/src/sysdep.c 2012-08-07 07:42:34 +0000
@@ -2159,7 +2159,7 @@
int err = -1;
char summary[4] = "???"; /* This usually becomes "8N1". */
- childp2 = Fcopy_sequence (PGET (p, childp));
+ childp2 = Fcopy_sequence (p->childp);
/* Read port attributes and prepare default configuration. */
err = tcgetattr (p->outfd, &attr);
@@ -2177,7 +2177,7 @@
if (!NILP (Fplist_member (contact, QCspeed)))
tem = Fplist_get (contact, QCspeed);
else
- tem = Fplist_get (PGET (p, childp), QCspeed);
+ tem = Fplist_get (p->childp, QCspeed);
CHECK_NUMBER (tem);
err = cfsetspeed (&attr, XINT (tem));
if (err != 0)
@@ -2189,7 +2189,7 @@
if (!NILP (Fplist_member (contact, QCbytesize)))
tem = Fplist_get (contact, QCbytesize);
else
- tem = Fplist_get (PGET (p, childp), QCbytesize);
+ tem = Fplist_get (p->childp, QCbytesize);
if (NILP (tem))
tem = make_number (8);
CHECK_NUMBER (tem);
@@ -2210,7 +2210,7 @@
if (!NILP (Fplist_member (contact, QCparity)))
tem = Fplist_get (contact, QCparity);
else
- tem = Fplist_get (PGET (p, childp), QCparity);
+ tem = Fplist_get (p->childp, QCparity);
if (!NILP (tem) && !EQ (tem, Qeven) && !EQ (tem, Qodd))
error (":parity must be nil (no parity), `even', or `odd'");
#if defined (PARENB) && defined (PARODD) && defined (IGNPAR) && defined (INPCK)
@@ -2243,7 +2243,7 @@
if (!NILP (Fplist_member (contact, QCstopbits)))
tem = Fplist_get (contact, QCstopbits);
else
- tem = Fplist_get (PGET (p, childp), QCstopbits);
+ tem = Fplist_get (p->childp, QCstopbits);
if (NILP (tem))
tem = make_number (1);
CHECK_NUMBER (tem);
@@ -2265,7 +2265,7 @@
if (!NILP (Fplist_member (contact, QCflowcontrol)))
tem = Fplist_get (contact, QCflowcontrol);
else
- tem = Fplist_get (PGET (p, childp), QCflowcontrol);
+ tem = Fplist_get (p->childp, QCflowcontrol);
if (!NILP (tem) && !EQ (tem, Qhw) && !EQ (tem, Qsw))
error (":flowcontrol must be nil (no flowcontrol), `hw', or `sw'");
#if defined (CRTSCTS)
=== modified file 'src/w32.c'
--- a/src/w32.c 2012-08-06 22:07:01 +0000
+++ b/src/w32.c 2012-08-07 07:42:34 +0000
@@ -6890,7 +6890,7 @@
error ("Not a serial process");
hnd = fd_info[ p->outfd ].hnd;
- childp2 = Fcopy_sequence (PGET (p, childp));
+ childp2 = Fcopy_sequence (p->childp);
/* Initialize timeouts for blocking read and blocking write. */
if (!GetCommTimeouts (hnd, &ct))
@@ -6919,7 +6919,7 @@
if (!NILP (Fplist_member (contact, QCspeed)))
tem = Fplist_get (contact, QCspeed);
else
- tem = Fplist_get (PGET (p, childp), QCspeed);
+ tem = Fplist_get (p->childp, QCspeed);
CHECK_NUMBER (tem);
dcb.BaudRate = XINT (tem);
childp2 = Fplist_put (childp2, QCspeed, tem);
@@ -6928,7 +6928,7 @@
if (!NILP (Fplist_member (contact, QCbytesize)))
tem = Fplist_get (contact, QCbytesize);
else
- tem = Fplist_get (PGET (p, childp), QCbytesize);
+ tem = Fplist_get (p->childp, QCbytesize);
if (NILP (tem))
tem = make_number (8);
CHECK_NUMBER (tem);
@@ -6942,7 +6942,7 @@
if (!NILP (Fplist_member (contact, QCparity)))
tem = Fplist_get (contact, QCparity);
else
- tem = Fplist_get (PGET (p, childp), QCparity);
+ tem = Fplist_get (p->childp, QCparity);
if (!NILP (tem) && !EQ (tem, Qeven) && !EQ (tem, Qodd))
error (":parity must be nil (no parity), `even', or `odd'");
dcb.fParity = FALSE;
@@ -6972,7 +6972,7 @@
if (!NILP (Fplist_member (contact, QCstopbits)))
tem = Fplist_get (contact, QCstopbits);
else
- tem = Fplist_get (PGET (p, childp), QCstopbits);
+ tem = Fplist_get (p->childp, QCstopbits);
if (NILP (tem))
tem = make_number (1);
CHECK_NUMBER (tem);
@@ -6989,7 +6989,7 @@
if (!NILP (Fplist_member (contact, QCflowcontrol)))
tem = Fplist_get (contact, QCflowcontrol);
else
- tem = Fplist_get (PGET (p, childp), QCflowcontrol);
+ tem = Fplist_get (p->childp, QCflowcontrol);
if (!NILP (tem) && !EQ (tem, Qhw) && !EQ (tem, Qsw))
error (":flowcontrol must be nil (no flowcontrol), `hw', or `sw'");
dcb.fOutxCtsFlow = FALSE;
=== modified file 'src/xdisp.c'
--- a/src/xdisp.c 2012-08-07 07:33:18 +0000
+++ b/src/xdisp.c 2012-08-07 07:42:34 +0000
@@ -21676,9 +21676,9 @@
if (PROCESSP (obj))
{
p = decode_mode_spec_coding
- (PGET (XPROCESS (obj), decode_coding_system), p, eol_flag);
+ (XPROCESS (obj)->decode_coding_system, p, eol_flag);
p = decode_mode_spec_coding
- (PGET (XPROCESS (obj), encode_coding_system), p, eol_flag);
+ (XPROCESS (obj)->encode_coding_system, p, eol_flag);
}
#endif /* subprocesses */
#endif /* 0 */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r109490: Drop PGET and revert read access to Lisp_Objects slots of Lisp_Process.,
Dmitry Antipov <=