Compliant to policy 4.4.1

Remove unused variables
Global variable keyhandler is declared as pointer to incomplete struct type. Upon closer inspection, it turned out that this variable and client_handles_keys are unused.
2019-11-19 00:51:09 +03:00 · 2019-11-18 23:58:12 +03:00 · 2019-11-17 15:24:38 +03:00 · 2019-11-16 19:25:25 +01:00
5 changed files with 66 additions and 6 deletions
@@ -1,3 +1,17 @@
+g15daemon (1.9.5.3-11) unstable; urgency=medium
+
+  * Reinitialize on eny error code, not only on a negative one.
+  * Remove unused variables. (Closes: bug#688465)
+  * Compliant to policy 4.4.1
+
+ -- Alexander Ponyatykh <lazyranma@gmail.com>  Tue, 19 Nov 2019 00:50:44 +0300
+
+g15daemon (1.9.5.3-10) unstable; urgency=medium
+
+  * Rebuild (no source changes).
+
+ -- Andrej Shadura <andrewsh@debian.org>  Sat, 16 Nov 2019 19:25:13 +0100
+
 g15daemon (1.9.5.3-9) unstable; urgency=medium

  [ Alexander Ponyatykh ]
@@ -10,7 +10,7 @@ Build-Depends:
 libg15-dev (>= 1.2.7-3),
 libg15render-dev (>= 1.2.0.svn250-2),
 libtool
-Standards-Version: 4.1.4
+Standards-Version: 4.4.1
 Homepage: https://sourceforge.net/projects/g15daemon/
 Vcs-Browser: https://salsa.debian.org/debian/g15daemon
 Vcs-Git: https://salsa.debian.org/debian/g15daemon.git
@@ -3,20 +3,21 @@ Description: Reinitialize on any libusb error.
 Author: Alexander Ponyatykh <lazyranma@gmail.com>
 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libusb/+bug/1357556
 Forwarded: no
-Last-Update: 2015-05-18
+Last-Update: 2019-11-17
 ===================================================================
 --- a/g15daemon/main.c
 +++ b/g15daemon/main.c
-@@ -204,10 +204,10 @@
+@@ -203,11 +203,10 @@
+             g15daemon_send_event(masterlist->current->lcd, 
                                  G15_EVENT_KEYPRESS, keypresses);
             lastkeys = keypresses;
- 
+-
 -        }else if(retval == -ENODEV && LIBG15_VERSION>=1200) {
-+        }else if(retval < 0 && LIBG15_VERSION>=1200) {
+        }else if(retval != G15_NO_ERROR && retval != G15_ERROR_TIMEOUT && LIBG15_VERSION>=1200) {
+          g15daemon_log(LOG_WARNING,"Keyboard error (%d).. Reinitializing\n", retval);
           pthread_mutex_lock(&g15lib_mutex);
           while((retval=re_initLibG15() != G15_NO_ERROR) && !leaving){
 -             g15daemon_log(LOG_WARNING,"Keyboard has gone.. Retrying\n");
-+             g15daemon_log(LOG_WARNING,"Keyboard error (%d).. Reinitializing\n", retval);
              sleep(1);
           }
           if(!leaving) { 
@@ -0,0 +1,44 @@
+Description: Remove unused variables
+ Global variable keyhandler is declared as pointer to incomplete struct type.
+ Upon closer inspection, it turned out that this variable and
+ client_handles_keys are unused.
+Author: Alexander Ponyatykh <lazyranma@gmail.com>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=688465
+Last-Update: 2019-11-18
+===================================================================
+--- a/g15daemon/linked_lists.c
+++ b/g15daemon/linked_lists.c
+@@ -30,8 +30,6 @@
+ #include <g15daemon.h>
+ #include <libg15.h>
+ 
+-extern lcd_t *keyhandler;
+-extern unsigned int client_handles_keys;
+ extern plugin_info_t *generic_info;
+ 
+ lcd_t static * ll_create_lcd () {
+@@ -175,12 +173,6 @@
+         (*masterlist)->current->lcd->state_changed = 1;
+     }
+     
+-    if(&oldnode->lcd == (void*)keyhandler) {
+-        client_handles_keys = 0;
+-        keyhandler = NULL;
+-        g15daemon_log(LOG_WARNING,"Client key handler quit, going back to defaults");
+-    }
+-    
+     if((*masterlist)->head!=oldnode){
+         (*next)->prev = oldnode->prev;
+         (*prev)->next = oldnode->next;
+--- a/g15daemon/main.c
+++ b/g15daemon/main.c
+@@ -53,9 +53,7 @@
+ int keyboard_backlight_off_onexit = 0;
+ unsigned int g15daemon_debug = 0;
+ unsigned int cycle_key;
+-unsigned int client_handles_keys = 0;
+ static unsigned int set_backlight = 0;
+-struct lcd_t *keyhandler = NULL;
+ 
+ static int loaded_plugins = 0;
+ 
@@ -5,3 +5,4 @@
 05-send-a-sync-event-after-key-up-down.diff
 06-fix-buffer-overflow.diff
 07-reinit-on-any-error.diff
+08-remove-unused-variables.diff
Author	SHA1	Message	Date
Alexander Ponyatykh	9b57b2e29c	Compliant to policy 4.4.1	2019-11-19 00:51:09 +03:00
Alexander Ponyatykh	107f0d8a79	Remove unused variables Global variable keyhandler is declared as pointer to incomplete struct type. Upon closer inspection, it turned out that this variable and client_handles_keys are unused.	2019-11-18 23:58:12 +03:00
Alexander Ponyatykh	7d071c32b7	Reinitialize on any error code, not just a negative one. Upstream libg15 propagates any error code from libusb to the caller, and legacy libusb-0.1 uses standard codes from errno.h with minus sign resulting in negative integers. Previous version of reinit-on-any-error patch uses this fact and calls re_initLibG15() on any negative return value of getPressedKeys(). The new libusb-1.0 uses its own error codes, not compatible with the old ones. While rewriting libg15 to use the new library, I decided to translate LIBUSB_ERROR_* codes to G15_ERROR_*, which are positive integers. This change requires us to modify reinit-on-any-error patch to call re_initLibG15() on any error code, not just a negative one.	2019-11-17 15:24:38 +03:00
Andrej Shadura	96591e26fa	Rebuild (no source changes)	2019-11-16 19:25:25 +01:00