← Back to branch summary

~jderose/ubuntu/raring/qemu/vde-again

« back to all changes in this revision

Viewing changes to keymaps.c

  • Committer: Bazaar Package Importer
  • Author(s): Aurelien Jarno, Aurelien Jarno
  • Date: 2009-03-22 10:13:17 UTC
  • mfrom: (1.2.1 upstream) (6.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20090322101317-iigjtnu5qil35dtb
Tags: 0.10.1-1
http://bugs.debian.org/501400
[ Aurelien Jarno ]
* New upstream stable release:
  - patches/80_stable-branch.patch: remove.
* debian/control: 
  - Remove depends on proll.
  - Move depends on device-tree-compiler to build-depends.
  - Bump Standards-Version to 3.8.1 (no changes).
* patches/82_qemu-img_decimal.patch: new patch from upstream to make
  qemu-img accept sizes with decimal values (closes: bug#501400).

Show diffs side-by-side

added added

removed removed

Lines of Context:
keymaps.c
24
24
 
25
25
static int get_keysym(const char *name)
26
26
{
27
 
    name2keysym_t *p;
 
27
    const name2keysym_t *p;
28
28
    for(p = name2keysym; p->name != NULL; p++) {
29
29
        if (!strcmp(p->name, name))
30
30
            return p->keysym;
67
67
    }
68
68
    if (kr == NULL) {
69
69
        kr = qemu_mallocz(sizeof(*kr));
70
 
        if (kr) {
71
 
            kr->start = kr->end = code;
72
 
            kr->next = *krp;
73
 
            *krp = kr;
74
 
        }
 
70
        kr->start = kr->end = code;
 
71
        kr->next = *krp;
 
72
        *krp = kr;
75
73
    }
76
74
}
77
75
 
88
86
 
89
87
    if (!k)
90
88
        k = qemu_mallocz(sizeof(kbd_layout_t));
91
 
    if (!k)
92
 
        return 0;
93
89
    if (!(f = fopen(file_name, "r"))) {
94
90
        fprintf(stderr,
95
91
                "Could not read keymap file: '%s'\n", file_name);