[systemd-commits] 2 commits - hwdb/60-keyboard.hwdb src/shared

[Kay Sievers]

 hwdb/60-keyboard.hwdb |    2 +-
 src/shared/hashmap.c  |    4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 2dd30e7da94b32df03451df8cf602e9454a376cb
Author: Kay Sievers <kay at vrfy.org>
Date:   Thu Aug 15 16:07:51 2013 +0200

    hwdb: keyboard  - remove stray "
    
    <dvdhrm> kay, hwdb/60-keyboard.hwdb line 147 it says KEYBOARD_KEY_ee=screenlock"
             with a " at the end. I guess that's a typo?

diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb
index 0c6f293..a77aa00 100644
--- a/hwdb/60-keyboard.hwdb
+++ b/hwdb/60-keyboard.hwdb
@@ -144,7 +144,7 @@ keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnTravelMate*4720*:pvr*
 keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnTravelMate 6593:*
 keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnAspire 1640:*
  KEYBOARD_KEY_b2=www
- KEYBOARD_KEY_ee=screenlock"
+ KEYBOARD_KEY_ee=screenlock
 
 ###########################################################
 # Alienware

commit 585275000ccd522f403365236492dc924778d286
Author: Kay Sievers <kay at vrfy.org>
Date:   Thu Aug 15 15:15:36 2013 +0200

    hashmap: remove empty lines

diff --git a/src/shared/hashmap.c b/src/shared/hashmap.c
index 9f7db34..4ea1a0f 100644
--- a/src/shared/hashmap.c
+++ b/src/shared/hashmap.c
@@ -373,13 +373,10 @@ int hashmap_put(Hashmap *h, const void *key, void *value) {
         assert(h);
 
         hash = h->hash_func(key) % NBUCKETS;
-
         e = hash_scan(h, hash, key);
         if (e) {
-
                 if (e->value == value)
                         return 0;
-
                 return -EEXIST;
         }
 
@@ -534,7 +531,6 @@ int hashmap_remove_and_replace(Hashmap *h, const void *old_key, const void *new_
                 return -ENOENT;
 
         new_hash = h->hash_func(new_key) % NBUCKETS;
-
         if ((k = hash_scan(h, new_hash, new_key)))
                 if (e != k)
                         remove_entry(h, k);