procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Port to --enable-gcc-warnings sans getaddrinfo_a

Browse source 
* src/process.c (Fmake_network_process): Add ATTRIBUTE_UNUSED
to a local unused when getaddrinfo_a is missing.
Resize portbuf to size needed.  Do cheap test first.
Move local to block where it’s needed.
This commit is contained in:
Paul Eggert 2016-02-23 15:25:43 -08:00
parent 82848cf689
commit c7b8194c04
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/process.c
View file

@ -3600,8 +3600,8 @@ usage: (make-network-process &rest ARGS) */)
struct Lisp_Process *p;
#if defined HAVE_GETADDRINFO || defined HAVE_GETADDRINFO_A
const char *portstring;
ptrdiff_t portstringlen;
char portbuf[128];
ptrdiff_t portstringlen ATTRIBUTE_UNUSED;
char portbuf[INT_BUFSIZE_BOUND (EMACS_INT)];
#endif
#ifdef HAVE_LOCAL_SOCKETS
struct sockaddr_un address_un;
@ -3770,7 +3770,7 @@ usage: (make-network-process &rest ARGS) */)
#endif
#ifdef HAVE_GETADDRINFO_A
if (!NILP (Fplist_get (contact, QCnowait)) && !NILP (host))
if (!NILP (host) && !NILP (Fplist_get (contact, QCnowait)))
{
ptrdiff_t hostlen = SBYTES (host);
struct req
@ -4897,7 +4897,6 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
#if defined HAVE_GETADDRINFO_A || defined HAVE_GNUTLS
{
Lisp_Object ip_addresses;
Lisp_Object process_list_head, aproc;
struct Lisp_Process *p;
@ -4911,7 +4910,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
/* Check for pending DNS requests. */
if (p->dns_request)
{
ip_addresses = check_for_dns (aproc);
Lisp_Object ip_addresses = check_for_dns (aproc);
if (!NILP (ip_addresses) && !EQ (ip_addresses, Qt))
connect_network_socket (aproc, ip_addresses);
}