[at-spi2-core] Do not declare unused variables
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [at-spi2-core] Do not declare unused variables
- Date: Thu, 17 May 2018 14:47:55 +0000 (UTC)
commit 0dd0a698abd55e1529ecbe1c1e0a4d43d4d1bb19
Author: Emmanuele Bassi <ebassi gnome org>
Date: Thu May 17 15:28:26 2018 +0100
Do not declare unused variables
The variables are declared and set, but only used in blocks that have
been commented out because currently broken.
Let's move the broken block to include sites where the variables are
declared and set.
registryd/deviceeventcontroller-x11.c | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/registryd/deviceeventcontroller-x11.c b/registryd/deviceeventcontroller-x11.c
index d9d9a6c..e5b8dfc 100644
--- a/registryd/deviceeventcontroller-x11.c
+++ b/registryd/deviceeventcontroller-x11.c
@@ -1018,8 +1018,10 @@ spi_dec_x11_synth_keycode_press (SpiDEController *controller,
{
unsigned int time = CurrentTime;
unsigned int bounce_delay;
+#ifdef THIS_IS_BROKEN
unsigned int elapsed_msec;
struct timeval tv;
+#endif
DEControllerPrivateData *priv = controller->priv;
spi_x_error_trap ();
@@ -1028,15 +1030,15 @@ spi_dec_x11_synth_keycode_press (SpiDEController *controller,
bounce_delay = xkb_get_bouncekeys_delay (controller);
if (bounce_delay)
{
+#ifdef THIS_IS_BROKEN
gettimeofday (&tv, NULL);
elapsed_msec =
(tv.tv_sec - priv->last_release_time.tv_sec) * 1000
+ (tv.tv_usec - priv->last_release_time.tv_usec) / 1000;
-#ifdef SPI_XKB_DEBUG
+# ifdef SPI_XKB_DEBUG
fprintf (stderr, "%d ms elapsed (%ld usec)\n", elapsed_msec,
(long) (tv.tv_usec - priv->last_release_time.tv_usec));
-#endif
-#ifdef THIS_IS_BROKEN
+# endif
if (elapsed_msec < bounce_delay)
time = bounce_delay - elapsed_msec + 1;
#else
@@ -1062,8 +1064,10 @@ spi_dec_x11_synth_keycode_release (SpiDEController *controller,
{
unsigned int time = CurrentTime;
unsigned int slow_delay;
+#ifdef THIS_IS_BROKEN_DUNNO_WHY
unsigned int elapsed_msec;
struct timeval tv;
+#endif
DEControllerPrivateData *priv = controller->priv;
spi_x_error_trap ();
@@ -1072,15 +1076,15 @@ spi_dec_x11_synth_keycode_release (SpiDEController *controller,
slow_delay = xkb_get_slowkeys_delay (controller);
if (slow_delay)
{
+#ifdef THIS_IS_BROKEN_DUNNO_WHY
gettimeofday (&tv, NULL);
elapsed_msec =
(tv.tv_sec - priv->last_press_time.tv_sec) * 1000
+ (tv.tv_usec - priv->last_press_time.tv_usec) / 1000;
-#ifdef SPI_XKB_DEBUG
+# ifdef SPI_XKB_DEBUG
fprintf (stderr, "%d ms elapsed (%ld usec)\n", elapsed_msec,
(long) (tv.tv_usec - priv->last_press_time.tv_usec));
-#endif
-#ifdef THIS_IS_BROKEN_DUNNO_WHY
+# endif
if (elapsed_msec < slow_delay)
time = slow_delay - elapsed_msec + 1;
#else
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]