hal: Branch 'master'
David Zeuthen
david at kemper.freedesktop.org
Tue Sep 25 12:30:48 PDT 2007
tools/hal-acl-tool.c | 14 +++-
tools/hal-setup-keymap-hash-name.h | 119 ++++++++++++++++++-------------------
2 files changed, 71 insertions(+), 62 deletions(-)
New commits:
diff-tree 66cb813715538818770df7685ab2be4d85d75a07 (from d0dfd958d45c81ab57713d07e42634e1c5110ccb)
Author: David Zeuthen <davidz at redhat.com>
Date: Tue Sep 25 15:27:43 2007 -0400
skip the ACL entry instead of bailing out when using bad fdi files
See https://bugzilla.redhat.com/show_bug.cgi?id=305801 for details
diff --git a/tools/hal-acl-tool.c b/tools/hal-acl-tool.c
index 7a6a942..b4f8ea8 100644
--- a/tools/hal-acl-tool.c
+++ b/tools/hal-acl-tool.c
@@ -1086,18 +1086,26 @@ acl_reconfigure_all (void)
if (device == NULL) {
printf ("%d: access_control.file not set for '%s'\n", getpid (), udis[i]);
- goto out;
+ if (type != NULL)
+ libhal_free_string (type);
+ acl_for_device_free (afd);
+ goto skip;
}
if (type == NULL) {
printf ("%d: access_control.type not set for '%s'\n", getpid (), udis[i]);
- goto out;
+ if (device != NULL)
+ libhal_free_string (device);
+ if (type != NULL)
+ libhal_free_string (type);
+ acl_for_device_free (afd);
+ goto skip;
}
acl_for_device_set_device (afd, device);
acl_for_device_set_type (afd, type);
afd_list = g_slist_prepend (afd_list, afd);
-
+ skip:
libhal_free_property_set (props);
}
libhal_free_string_array (udis);
diff --git a/tools/hal-setup-keymap-hash-name.h b/tools/hal-setup-keymap-hash-name.h
index 65a78e0..52ed0b4 100644
--- a/tools/hal-setup-keymap-hash-name.h
+++ b/tools/hal-setup-keymap-hash-name.h
@@ -31,7 +31,7 @@ error "gperf generated tables don't work
struct key { const char* name; unsigned short id; };
-#define TOTAL_KEYWORDS 353
+#define TOTAL_KEYWORDS 355
#define MIN_WORD_LENGTH 1
#define MAX_WORD_LENGTH 16
#define MIN_HASH_VALUE 1
@@ -99,8 +99,8 @@ hash_input_names (str, len)
1372, 1372, 1372, 1372, 1372, 1372, 1372, 1372, 1372, 1372,
1372, 1372, 1372, 1372, 1372, 1372, 1372, 1372, 1372, 1372,
1372, 1372, 1372, 1372, 1372, 1372, 1372, 1372, 1372, 1372,
- 1372, 1372, 1372, 1372, 1372, 1372, 1372, 1372, 315, 115,
- 60, 280, 170, 125, 175, 130, 215, 140, 40, 1372,
+ 1372, 1372, 1372, 1372, 1372, 1372, 1372, 1372, 240, 115,
+ 60, 280, 170, 125, 335, 130, 175, 215, 0, 1372,
1372, 1372, 1372, 1372, 1372, 35, 205, 75, 15, 10,
250, 400, 45, 150, 110, 290, 195, 30, 95, 5,
50, 145, 0, 20, 40, 80, 370, 415, 123, 325,
@@ -335,8 +335,7 @@ lookup_key (str, len)
{"CUT", KEY_CUT},
{"RIGHTMETA", KEY_RIGHTMETA},
{"RIGHT", KEY_RIGHT},
- {"9", KEY_9},
- {(char*)0},
+ {(char*)0}, {(char*)0},
{"RIGHTALT", KEY_RIGHTALT},
{(char*)0},
{"RIGHTSHIFT", KEY_RIGHTSHIFT},
@@ -384,7 +383,7 @@ lookup_key (str, len)
{"CLOSE", KEY_CLOSE},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0},
- {"6", KEY_6},
+ {"8", KEY_8},
{"CLOSECD", KEY_CLOSECD},
{"DATABASE", KEY_DATABASE},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
@@ -444,9 +443,9 @@ lookup_key (str, len)
{"BRL_DOT4", KEY_BRL_DOT4},
{"LIST", KEY_LIST},
{"SOUND", KEY_SOUND},
- {"8", KEY_8},
+ {"9", KEY_9},
{"EJECTCD", KEY_EJECTCD},
- {"BRL_DOT6", KEY_BRL_DOT6},
+ {"BRL_DOT8", KEY_BRL_DOT8},
{"FN_2", KEY_FN_2},
{"KPDOT", KEY_KPDOT},
{(char*)0},
@@ -476,14 +475,14 @@ lookup_key (str, len)
{(char*)0},
{"FN_ESC", KEY_FN_ESC},
{"REFRESH", KEY_REFRESH},
- {"BRL_DOT8", KEY_BRL_DOT8},
+ {"BRL_DOT9", KEY_BRL_DOT9},
{"NEXT", KEY_NEXT},
{(char*)0}, {(char*)0},
{"UNKNOWN", KEY_UNKNOWN},
{"PREVIOUS", KEY_PREVIOUS},
{"CHANNELUP", KEY_CHANNELUP},
{"PAUSE", KEY_PAUSE},
- {(char*)0},
+ {"0", KEY_0},
{"F1", KEY_F1},
{(char*)0},
{"SAVE", KEY_SAVE},
@@ -497,7 +496,8 @@ lookup_key (str, len)
{"FN_F2", KEY_FN_F2},
{(char*)0}, {(char*)0},
{"INS_LINE", KEY_INS_LINE},
- {(char*)0}, {(char*)0},
+ {"BRL_DOT10", KEY_BRL_DOT10},
+ {(char*)0},
{"F", KEY_F},
{"F5", KEY_F5},
{"WORDPROCESSOR", KEY_WORDPROCESSOR},
@@ -514,15 +514,13 @@ lookup_key (str, len)
{"FINANCE", KEY_FINANCE},
{"KP1", KEY_KP1},
{"PLAYPAUSE", KEY_PLAYPAUSE},
- {(char*)0}, {(char*)0}, {(char*)0},
- {"KP9", KEY_KP9},
+ {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0},
{"CLEAR", KEY_CLEAR},
{"CHANNELDOWN", KEY_CHANNELDOWN},
{(char*)0}, {(char*)0},
{"VCR2", KEY_VCR2},
- {(char*)0}, {(char*)0},
- {"F9", KEY_F9},
+ {(char*)0}, {(char*)0}, {(char*)0},
{"MP3", KEY_MP3},
{"BASSBOOST", KEY_BASSBOOST},
{(char*)0}, {(char*)0}, {(char*)0},
@@ -534,8 +532,7 @@ lookup_key (str, len)
{"ZOOM", KEY_ZOOM},
{"VIDEO", KEY_VIDEO},
{"PLAYCD", KEY_PLAYCD},
- {(char*)0},
- {"F19", KEY_F19},
+ {(char*)0}, {(char*)0},
{"BACK", KEY_BACK},
{(char*)0},
{"FN_F12", KEY_FN_F12},
@@ -544,7 +541,7 @@ lookup_key (str, len)
{"VIDEOPHONE", KEY_VIDEOPHONE},
{(char*)0},
{"KPMINUS", KEY_KPMINUS},
- {(char*)0},
+ {"KP9", KEY_KP9},
{"ZOOMRESET", KEY_ZOOMRESET},
{(char*)0},
{"3", KEY_3},
@@ -561,14 +558,16 @@ lookup_key (str, len)
{"FN_B", KEY_FN_B},
{(char*)0},
{"K", KEY_K},
- {(char*)0}, {(char*)0}, {(char*)0},
+ {(char*)0},
+ {"F19", KEY_F19},
+ {(char*)0},
{"VIDEO_NEXT", KEY_VIDEO_NEXT},
{(char*)0},
{"OK", KEY_OK},
{(char*)0}, {(char*)0}, {(char*)0},
{"KPPLUS", KEY_KPPLUS},
{"F4", KEY_F4},
- {(char*)0},
+ {"BRL_DOT6", KEY_BRL_DOT6},
{"DIRECTORY", KEY_DIRECTORY},
{(char*)0},
{"KPPLUSMINUS", KEY_KPPLUSMINUS},
@@ -576,7 +575,7 @@ lookup_key (str, len)
{"ZENKAKUHANKAKU", KEY_ZENKAKUHANKAKU},
{(char*)0},
{"FASTFORWARD", KEY_FASTFORWARD},
- {"F6", KEY_F6},
+ {"F8", KEY_F8},
{(char*)0}, {(char*)0},
{"FN_F1", KEY_FN_F1},
{"FN_F11", KEY_FN_F11},
@@ -596,8 +595,7 @@ lookup_key (str, len)
{"XFER", KEY_XFER},
{(char*)0}, {(char*)0},
{"GRAVE", KEY_GRAVE},
- {"0", KEY_0},
- {(char*)0}, {(char*)0}, {(char*)0},
+ {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{"FN_F7", KEY_FN_F7},
{(char*)0},
{"KPENTER", KEY_KPENTER},
@@ -605,21 +603,18 @@ lookup_key (str, len)
{(char*)0},
{"EMAIL", KEY_EMAIL},
{"CONFIG", KEY_CONFIG},
- {(char*)0},
- {"KP5", KEY_KP5},
- {(char*)0},
+ {(char*)0}, {(char*)0}, {(char*)0},
{"SWITCHVIDEOMODE", KEY_SWITCHVIDEOMODE},
{"NEW", KEY_NEW},
{(char*)0},
- {"KP6", KEY_KP6},
+ {"KP7", KEY_KP7},
{"LEFT", KEY_LEFT},
{(char*)0},
{"Y", KEY_Y},
{(char*)0},
{"F22", KEY_F22},
{"INFO", KEY_INFO},
- {"FN_F9", KEY_FN_F9},
- {(char*)0}, {(char*)0},
+ {(char*)0}, {(char*)0}, {(char*)0},
{"HIRAGANA", KEY_HIRAGANA},
{(char*)0}, {(char*)0},
{"DISPLAY_OFF", KEY_DISPLAY_OFF},
@@ -628,25 +623,27 @@ lookup_key (str, len)
{"GRAPHICSEDITOR", KEY_GRAPHICSEDITOR},
{"PROG3", KEY_PROG3},
{(char*)0}, {(char*)0},
- {"F15", KEY_F15},
- {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
- {"F16", KEY_F16},
+ {"F20", KEY_F20},
+ {(char*)0},
+ {"102ND", KEY_102ND},
+ {"6", KEY_6},
+ {(char*)0},
+ {"F17", KEY_F17},
{"LEFTSHIFT", KEY_LEFTSHIFT},
{(char*)0}, {(char*)0}, {(char*)0},
{"LEFTMETA", KEY_LEFTMETA},
{(char*)0},
{"SYSRQ", KEY_SYSRQ},
{(char*)0},
- {"F8", KEY_F8},
+ {"F9", KEY_F9},
{"KP2", KEY_KP2},
{"SLOW", KEY_SLOW},
{(char*)0}, {(char*)0},
{"LEFTALT", KEY_LEFTALT},
- {"KP7", KEY_KP7},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
- {(char*)0},
- {"KP8", KEY_KP8},
+ {(char*)0}, {(char*)0},
+ {"KP0", KEY_KP0},
{"VOICEMAIL", KEY_VOICEMAIL},
{(char*)0}, {(char*)0},
{"SHUFFLE", KEY_SHUFFLE},
@@ -654,26 +651,25 @@ lookup_key (str, len)
{(char*)0},
{"F12", KEY_F12},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
- {"F17", KEY_F17},
- {(char*)0},
+ {(char*)0}, {(char*)0},
{"FN_F4", KEY_FN_F4},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0},
- {"F18", KEY_F18},
+ {"F10", KEY_F10},
{"KBDILLUMTOGGLE", KEY_KBDILLUMTOGGLE},
- {"FN_F6", KEY_FN_F6},
+ {"FN_F8", KEY_FN_F8},
{"KPLEFTPAREN", KEY_KPLEFTPAREN},
{(char*)0}, {(char*)0},
{"FAVORITES", KEY_FAVORITES},
- {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
+ {(char*)0},
+ {"FN_F10", KEY_FN_F10},
+ {(char*)0},
+ {"KP8", KEY_KP8},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{"KATAKANA", KEY_KATAKANA},
{(char*)0}, {(char*)0},
{"V", KEY_V},
- {(char*)0},
- {"F20", KEY_F20},
- {(char*)0},
- {"102ND", KEY_102ND},
+ {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{"KATAKANAHIRAGANA", KEY_KATAKANAHIRAGANA},
{(char*)0},
{"CAPSLOCK", KEY_CAPSLOCK},
@@ -682,17 +678,16 @@ lookup_key (str, len)
{(char*)0}, {(char*)0},
{"TV2", KEY_TV2},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
- {(char*)0}, {(char*)0},
+ {"F18", KEY_F18},
+ {(char*)0},
{"KBDILLUMUP", KEY_KBDILLUMUP},
{"ZOOMIN", KEY_ZOOMIN},
{(char*)0},
{"F23", KEY_F23},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
- {(char*)0},
- {"KP0", KEY_KP0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
- {(char*)0},
+ {(char*)0}, {(char*)0}, {(char*)0},
{"PLAY", KEY_PLAY},
{(char*)0},
{"WAKEUP", KEY_WAKEUP},
@@ -705,15 +700,16 @@ lookup_key (str, len)
{(char*)0},
{"KP3", KEY_KP3},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
- {"F10", KEY_F10},
- {(char*)0}, {(char*)0},
+ {(char*)0}, {(char*)0}, {(char*)0},
{"G", KEY_G},
- {(char*)0}, {(char*)0},
+ {(char*)0},
+ {"KP5", KEY_KP5},
{"TWEN", KEY_TWEN},
- {"FN_F8", KEY_FN_F8},
- {"FN_F10", KEY_FN_F10},
+ {"FN_F9", KEY_FN_F9},
+ {(char*)0},
{"KBDILLUMDOWN", KEY_KBDILLUMDOWN},
- {(char*)0}, {(char*)0},
+ {"KP6", KEY_KP6},
+ {(char*)0},
{"REPLY", KEY_REPLY},
{(char*)0},
{"F3", KEY_F3},
@@ -722,11 +718,14 @@ lookup_key (str, len)
{"F13", KEY_F13},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
- {(char*)0}, {(char*)0},
+ {(char*)0},
+ {"F15", KEY_F15},
{"LEFTBRACE", KEY_LEFTBRACE},
{(char*)0},
{"W", KEY_W},
- {(char*)0}, {(char*)0}, {(char*)0},
+ {(char*)0},
+ {"F16", KEY_F16},
+ {(char*)0},
{"AGAIN", KEY_AGAIN},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
@@ -763,10 +762,11 @@ lookup_key (str, len)
{"VIDEO_PREV", KEY_VIDEO_PREV},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{"EQUAL", KEY_EQUAL},
+ {(char*)0},
+ {"F6", KEY_F6},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
- {(char*)0}, {(char*)0},
{"FN_F3", KEY_FN_F3},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
@@ -796,6 +796,7 @@ lookup_key (str, len)
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{"BREAK", KEY_BREAK},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
+ {"FN_F6", KEY_FN_F6},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
@@ -877,7 +878,7 @@ lookup_key (str, len)
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
- {(char*)0}, {(char*)0},
+ {(char*)0},
{"WWW", KEY_WWW}
};
More information about the hal-commit
mailing list