[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108187: * xgselect.c (xg_select): Put maxfds+1 into a var.

[Paul Eggert]

------------------------------------------------------------
revno: 108187
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Wed 2012-05-09 22:27:24 -0700
message:
  * xgselect.c (xg_select): Put maxfds+1 into a var.
  
  This is slightly clearer, and pacifies Ubuntu 12.04 gcc.
modified:
  src/ChangeLog
  src/xgselect.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-05-10 05:00:53 +0000
+++ b/src/ChangeLog     2012-05-10 05:27:24 +0000
@@ -1,5 +1,8 @@
 2012-05-10  Paul Eggert  <address@hidden>
 
+       * xgselect.c (xg_select): Put maxfds+1 into a var.
+       This is slightly clearer, and pacifies Ubuntu 12.04 gcc.
+
        * sound.c (DEFAULT_ALSA_SOUND_DEVICE): Define only if HAVE_ALSA.
 
 2012-05-10  Dave Abrahams  <address@hidden>

=== modified file 'src/xgselect.c'
--- a/src/xgselect.c    2012-01-19 07:21:25 +0000
+++ b/src/xgselect.c    2012-05-10 05:27:24 +0000
@@ -41,7 +41,7 @@
   GMainContext *context = g_main_context_default ();
   int have_wfds = wfds != NULL;
   int n_gfds = 0, our_tmo = 0, retval = 0, our_fds = 0;
-  int i, nfds, tmo_in_millisec;
+  int i, nfds, fds_lim, tmo_in_millisec;
 
   if (rfds) memcpy (&all_rfds, rfds, sizeof (all_rfds));
   else FD_ZERO (&all_rfds);
@@ -97,14 +97,14 @@
       if (our_tmo) tmop = &tmo;
     }
 
-  nfds = select (max_fds+1, &all_rfds, have_wfds ? &all_wfds : NULL,
-                 efds, tmop);
+  fds_lim = max_fds + 1;
+  nfds = select (fds_lim, &all_rfds, have_wfds ? &all_wfds : NULL, efds, tmop);
 
   if (nfds < 0)
     retval = nfds;
   else if (nfds > 0)
     {
-      for (i = 0; i < max_fds+1; ++i)
+      for (i = 0; i < fds_lim; ++i)
         {
           if (FD_ISSET (i, &all_rfds))
             {