aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-03-13 00:05:40 -0800
committerPaul Eggert2011-03-13 00:05:40 -0800
commit41729b81ac6a60b482aafe7ddc48a43225874818 (patch)
tree12fb9f8a6ba452d2f2e66d7fcbccab285d4a1c7b /src
parentec6cf4c6ff2e43e3f42a2efe2759bc0c18b680cb (diff)
downloademacs-41729b81ac6a60b482aafe7ddc48a43225874818.tar.gz
emacs-41729b81ac6a60b482aafe7ddc48a43225874818.zip
* xgselect.c (xg_select): Remove unused var.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/xgselect.c17
2 files changed, 10 insertions, 9 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 45ee0125eeb..5c9efee320f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12011-03-13 Paul Eggert <eggert@cs.ucla.edu> 12011-03-13 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * xgselect.c (xg_select): Remove unused var.
4
3 * image.c (four_corners_best): Mark locals as initialized. 5 * image.c (four_corners_best): Mark locals as initialized.
4 (gif_load): Initialize transparent_p to zero (Bug#8238). 6 (gif_load): Initialize transparent_p to zero (Bug#8238).
5 Mark another local as initialized. 7 Mark another local as initialized.
diff --git a/src/xgselect.c b/src/xgselect.c
index 359a8fbc89b..96d763ff088 100644
--- a/src/xgselect.c
+++ b/src/xgselect.c
@@ -38,7 +38,7 @@ xg_select (int max_fds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds,
38 GMainContext *context = g_main_context_default (); 38 GMainContext *context = g_main_context_default ();
39 int have_wfds = wfds != NULL; 39 int have_wfds = wfds != NULL;
40 int n_gfds = 0, our_tmo = 0, retval = 0, our_fds = 0; 40 int n_gfds = 0, our_tmo = 0, retval = 0, our_fds = 0;
41 int prio, i, nfds, tmo_in_millisec; 41 int i, nfds, tmo_in_millisec;
42 42
43 if (rfds) memcpy (&all_rfds, rfds, sizeof (all_rfds)); 43 if (rfds) memcpy (&all_rfds, rfds, sizeof (all_rfds));
44 else FD_ZERO (&all_rfds); 44 else FD_ZERO (&all_rfds);
@@ -49,9 +49,9 @@ xg_select (int max_fds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds,
49 g_main_context_pending (context); 49 g_main_context_pending (context);
50 50
51 do { 51 do {
52 if (n_gfds > gfds_size) 52 if (n_gfds > gfds_size)
53 { 53 {
54 while (n_gfds > gfds_size) 54 while (n_gfds > gfds_size)
55 gfds_size *= 2; 55 gfds_size *= 2;
56 xfree (gfds); 56 xfree (gfds);
57 gfds = xmalloc (sizeof (*gfds) * gfds_size); 57 gfds = xmalloc (sizeof (*gfds) * gfds_size);
@@ -64,7 +64,7 @@ xg_select (int max_fds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds,
64 gfds_size); 64 gfds_size);
65 } while (n_gfds > gfds_size); 65 } while (n_gfds > gfds_size);
66 66
67 for (i = 0; i < n_gfds; ++i) 67 for (i = 0; i < n_gfds; ++i)
68 { 68 {
69 if (gfds[i].events & G_IO_IN) 69 if (gfds[i].events & G_IO_IN)
70 { 70 {
@@ -87,7 +87,7 @@ xg_select (int max_fds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds,
87 else 87 else
88 { 88 {
89 EMACS_TIME difference; 89 EMACS_TIME difference;
90 90
91 EMACS_SUB_TIME (difference, tmo, *timeout); 91 EMACS_SUB_TIME (difference, tmo, *timeout);
92 if (EMACS_TIME_NEG_P (difference)) our_tmo = 1; 92 if (EMACS_TIME_NEG_P (difference)) our_tmo = 1;
93 } 93 }
@@ -100,7 +100,7 @@ xg_select (int max_fds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds,
100 100
101 if (nfds < 0) 101 if (nfds < 0)
102 retval = nfds; 102 retval = nfds;
103 else if (nfds > 0) 103 else if (nfds > 0)
104 { 104 {
105 for (i = 0; i < max_fds+1; ++i) 105 for (i = 0; i < max_fds+1; ++i)
106 { 106 {
@@ -127,7 +127,7 @@ xg_select (int max_fds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds,
127 127
128 if (our_fds > 0 || (nfds == 0 && our_tmo)) 128 if (our_fds > 0 || (nfds == 0 && our_tmo))
129 { 129 {
130 130
131 /* If Gtk+ is in use eventually gtk_main_iteration will be called, 131 /* If Gtk+ is in use eventually gtk_main_iteration will be called,
132 unless retval is zero. */ 132 unless retval is zero. */
133#ifdef USE_GTK 133#ifdef USE_GTK
@@ -137,7 +137,7 @@ xg_select (int max_fds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds,
137 g_main_context_dispatch (context); 137 g_main_context_dispatch (context);
138 138
139 /* To not have to recalculate timeout, return like this. */ 139 /* To not have to recalculate timeout, return like this. */
140 if (retval == 0) 140 if (retval == 0)
141 { 141 {
142 retval = -1; 142 retval = -1;
143 errno = EINTR; 143 errno = EINTR;
@@ -156,4 +156,3 @@ xgselect_initialize (void)
156 gfds = xmalloc (sizeof (*gfds)*gfds_size); 156 gfds = xmalloc (sizeof (*gfds)*gfds_size);
157#endif /* defined (USE_GTK) || defined (HAVE_GCONF) */ 157#endif /* defined (USE_GTK) || defined (HAVE_GCONF) */
158} 158}
159