46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
Index: LVM2.2.02.84/libdm/datastruct/hash.c
|
|
===================================================================
|
|
--- LVM2.2.02.84.orig/libdm/datastruct/hash.c 2010-10-01 05:06:52.000000000 +0800
|
|
+++ LVM2.2.02.84/libdm/datastruct/hash.c 2011-02-15 14:45:59.000000000 +0800
|
|
@@ -19,7 +19,7 @@
|
|
struct dm_hash_node *next;
|
|
void *data;
|
|
unsigned keylen;
|
|
- char key[0];
|
|
+ unsigned char key[0];
|
|
};
|
|
|
|
struct dm_hash_table {
|
|
@@ -136,7 +136,7 @@
|
|
static struct dm_hash_node **_find(struct dm_hash_table *t, const char *key,
|
|
uint32_t len)
|
|
{
|
|
- unsigned h = _hash(key, len) & (t->num_slots - 1);
|
|
+ unsigned h = _hash((unsigned char*)key, len) & (t->num_slots - 1);
|
|
struct dm_hash_node **c;
|
|
|
|
for (c = &t->slots[h]; *c; c = &((*c)->next)) {
|
|
@@ -235,7 +235,7 @@
|
|
char *dm_hash_get_key(struct dm_hash_table *t __attribute__((unused)),
|
|
struct dm_hash_node *n)
|
|
{
|
|
- return n->key;
|
|
+ return (char*)n->key;
|
|
}
|
|
|
|
void *dm_hash_get_data(struct dm_hash_table *t __attribute__((unused)),
|
|
Index: LVM2.2.02.84/libdm/ioctl/libdm-iface.c
|
|
===================================================================
|
|
--- LVM2.2.02.84.orig/libdm/ioctl/libdm-iface.c 2011-02-05 05:26:33.000000000 +0800
|
|
+++ LVM2.2.02.84/libdm/ioctl/libdm-iface.c 2011-02-15 14:45:59.000000000 +0800
|
|
@@ -1983,7 +1983,8 @@
|
|
dmt->skip_lockfs ? "S " : "",
|
|
dmt->secure_data ? "W " : "",
|
|
dmt->query_inactive_table ? "I " : "",
|
|
- dmt->sector, _sanitise_message(dmt->message),
|
|
+ (unsigned long long int)dmt->sector,
|
|
+ _sanitise_message(dmt->message),
|
|
dmi->data_size);
|
|
#ifdef DM_IOCTLS
|
|
if (ioctl(_control_fd, command, dmi) < 0) {
|