Hello community, here is the log from the commit of package device-mapper checked in at Wed Aug 30 23:35:38 CEST 2006. -------- --- device-mapper/device-mapper.changes 2006-08-30 09:11:20.000000000 +0200 +++ device-mapper/device-mapper.changes 2006-08-30 14:39:29.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Aug 30 14:38:57 CEST 2006 - hare@suse.de + +- Fix gcc warnings +- Fix field display for 'dmsetup info'. + +------------------------------------------------------------------- New: ---- device-mapper-gcc-warnings.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ device-mapper.spec ++++++ --- /var/tmp/diff_new_pack.7ZhJ61/_old 2006-08-30 23:35:30.000000000 +0200 +++ /var/tmp/diff_new_pack.7ZhJ61/_new 2006-08-30 23:35:30.000000000 +0200 @@ -14,12 +14,13 @@ Group: System/Base Autoreqprov: on Version: 1.02.09 -Release: 3 +Release: 4 Summary: Device Mapper Tools Source: device-mapper.%{version}.tar.bz2 Source1: boot.device-mapper Patch: k_dev_t.dif Patch1: %{name}-option-values.patch +Patch2: %{name}-gcc-warnings.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq @@ -39,6 +40,7 @@ %patch %endif %patch1 -p1 +%patch2 -p1 %build CFLAGS="$RPM_OPT_FLAGS" \ @@ -71,6 +73,9 @@ %changelog -n device-mapper * Wed Aug 30 2006 - hare@suse.de +- Fix gcc warnings +- Fix field display for 'dmsetup info'. +* Wed Aug 30 2006 - hare@suse.de - Add 'major', 'minor', and 'uuid' as valid fields for 'dmsetup info -o XXX'. * Wed Aug 16 2006 - fehr@suse.de ++++++ device-mapper-gcc-warnings.patch ++++++ diff -pur device-mapper.1.02.09.orig/dmsetup/dmsetup.c device-mapper.1.02.09/dmsetup/dmsetup.c --- device-mapper.1.02.09.orig/dmsetup/dmsetup.c 2006-08-30 09:22:04.000000000 +0200 +++ device-mapper.1.02.09/dmsetup/dmsetup.c 2006-08-30 09:32:59.000000000 +0200 @@ -1329,7 +1329,7 @@ static void _out_char(const unsigned c) } } -static void _out_string(const unsigned char *str) +static void _out_string(const char *str) { while (*str) _out_char(*str++); diff -pur device-mapper.1.02.09.orig/lib/datastruct/hash.c device-mapper.1.02.09/lib/datastruct/hash.c --- device-mapper.1.02.09.orig/lib/datastruct/hash.c 2006-01-09 21:35:24.000000000 +0100 +++ device-mapper.1.02.09/lib/datastruct/hash.c 2006-08-30 09:27:47.000000000 +0200 @@ -19,7 +19,7 @@ struct dm_hash_node { struct dm_hash_node *next; void *data; unsigned keylen; - char key[0]; + unsigned char key[0]; }; struct dm_hash_table { @@ -140,7 +140,7 @@ void dm_hash_destroy(struct dm_hash_tabl 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)) @@ -232,7 +232,7 @@ void dm_hash_wipe(struct dm_hash_table * char *dm_hash_get_key(struct dm_hash_table *t, struct dm_hash_node *n) { - return n->key; + return (char *)n->key; } void *dm_hash_get_data(struct dm_hash_table *t, struct dm_hash_node *n) Nur in device-mapper.1.02.09/lib/datastruct: hash.c~. diff -pur device-mapper.1.02.09.orig/lib/ioctl/libdm-iface.c device-mapper.1.02.09/lib/ioctl/libdm-iface.c --- device-mapper.1.02.09.orig/lib/ioctl/libdm-iface.c 2006-08-08 23:22:31.000000000 +0200 +++ device-mapper.1.02.09/lib/ioctl/libdm-iface.c 2006-08-30 09:36:14.000000000 +0200 @@ -1555,7 +1555,8 @@ static struct dm_ioctl *_do_dm_ioctl(str dmt->major > 0 ? ") " : "", dmt->no_open_count ? 'N' : 'O', dmt->skip_lockfs ? "S " : "", - dmt->sector, dmt->message ? dmt->message : "", + (unsigned long long int)dmt->sector, + dmt->message ? dmt->message : "", dmi->data_size); #ifdef DM_IOCTLS if (ioctl(_control_fd, command, dmi) < 0) { Nur in device-mapper.1.02.09/lib/ioctl: libdm-iface.c~. ++++++ device-mapper-option-values.patch ++++++ --- /var/tmp/diff_new_pack.7ZhJ61/_old 2006-08-30 23:35:30.000000000 +0200 +++ /var/tmp/diff_new_pack.7ZhJ61/_new 2006-08-30 23:35:30.000000000 +0200 @@ -44,11 +44,11 @@ + printf("%s", uuid); + break; + } ++ if (v & 0xfe) ++ printf(":"); + } + v >>= 1; + shift++; -+ if (v) -+ printf(":"); + } + printf("\n"); + } else @@ -140,12 +140,12 @@ return 1; } -+static int _process_fields(char *optarg) ++static int _process_fields(char *arg) +{ + int flags = 0; + char *f, *e; + -+ f = optarg; ++ f = arg; + + while (f && *f) { + if (!strncmp("name", f, 4)) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@suse.de