diff options
| author | Paul Eggert | 2014-06-24 01:10:48 -0700 |
|---|---|---|
| committer | Paul Eggert | 2014-06-24 01:10:48 -0700 |
| commit | 40f5d4b76087eb5808ea228fc490b86cb9d85235 (patch) | |
| tree | 0214650f2d1d1712a494319aebbf1977db2eac50 /src/process.c | |
| parent | 7967f7d1d44a1c8e1b077fa186d43a86c72f5d95 (diff) | |
| download | emacs-40f5d4b76087eb5808ea228fc490b86cb9d85235.tar.gz emacs-40f5d4b76087eb5808ea228fc490b86cb9d85235.zip | |
Be more consistent about the 'Qfoo' naming convention.
* image.c (Fimagemagick_types):
* lisp.h (lisp_h_CHECK_TYPE, CHECK_TYPE, CHECK_ARRAY):
* process.c (Fmake_network_process):
Rename C local identifier 'Qfoo to avoid giving the false
impression that it stands for the symbol 'foo'.
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/process.c b/src/process.c index 592c43acc2d..3242222a94a 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -2844,7 +2844,7 @@ usage: (make-network-process &rest ARGS) */) | |||
| 2844 | struct gcpro gcpro1; | 2844 | struct gcpro gcpro1; |
| 2845 | ptrdiff_t count = SPECPDL_INDEX (); | 2845 | ptrdiff_t count = SPECPDL_INDEX (); |
| 2846 | ptrdiff_t count1; | 2846 | ptrdiff_t count1; |
| 2847 | Lisp_Object QCaddress; /* one of QClocal or QCremote */ | 2847 | Lisp_Object colon_address; /* Either QClocal or QCremote. */ |
| 2848 | Lisp_Object tem; | 2848 | Lisp_Object tem; |
| 2849 | Lisp_Object name, buffer, host, service, address; | 2849 | Lisp_Object name, buffer, host, service, address; |
| 2850 | Lisp_Object filter, sentinel; | 2850 | Lisp_Object filter, sentinel; |
| @@ -2892,8 +2892,8 @@ usage: (make-network-process &rest ARGS) */) | |||
| 2892 | backlog = XINT (tem); | 2892 | backlog = XINT (tem); |
| 2893 | } | 2893 | } |
| 2894 | 2894 | ||
| 2895 | /* Make QCaddress an alias for :local (server) or :remote (client). */ | 2895 | /* Make colon_address an alias for :local (server) or :remote (client). */ |
| 2896 | QCaddress = is_server ? QClocal : QCremote; | 2896 | colon_address = is_server ? QClocal : QCremote; |
| 2897 | 2897 | ||
| 2898 | /* :nowait BOOL */ | 2898 | /* :nowait BOOL */ |
| 2899 | if (!is_server && socktype != SOCK_DGRAM | 2899 | if (!is_server && socktype != SOCK_DGRAM |
| @@ -2920,7 +2920,7 @@ usage: (make-network-process &rest ARGS) */) | |||
| 2920 | res = &ai; | 2920 | res = &ai; |
| 2921 | 2921 | ||
| 2922 | /* :local ADDRESS or :remote ADDRESS */ | 2922 | /* :local ADDRESS or :remote ADDRESS */ |
| 2923 | address = Fplist_get (contact, QCaddress); | 2923 | address = Fplist_get (contact, colon_address); |
| 2924 | if (!NILP (address)) | 2924 | if (!NILP (address)) |
| 2925 | { | 2925 | { |
| 2926 | host = service = Qnil; | 2926 | host = service = Qnil; |
| @@ -3307,7 +3307,7 @@ usage: (make-network-process &rest ARGS) */) | |||
| 3307 | memcpy (datagram_address[s].sa, lres->ai_addr, lres->ai_addrlen); | 3307 | memcpy (datagram_address[s].sa, lres->ai_addr, lres->ai_addrlen); |
| 3308 | } | 3308 | } |
| 3309 | #endif | 3309 | #endif |
| 3310 | contact = Fplist_put (contact, QCaddress, | 3310 | contact = Fplist_put (contact, colon_address, |
| 3311 | conv_sockaddr_to_lisp (lres->ai_addr, lres->ai_addrlen)); | 3311 | conv_sockaddr_to_lisp (lres->ai_addr, lres->ai_addrlen)); |
| 3312 | #ifdef HAVE_GETSOCKNAME | 3312 | #ifdef HAVE_GETSOCKNAME |
| 3313 | if (!is_server) | 3313 | if (!is_server) |