diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-14 19:23:00 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-14 19:23:00 +0000 |
| commit | 803b3a091c225d48395508a8f9ffa6e08cbddc5b (patch) | |
| tree | a3168c9e7da8991c423b5978aacf90c3c2b135c1 /libfdisk | |
| parent | Releasing progress-linux version 2.40-8~progress7.99u1. (diff) | |
| download | util-linux-803b3a091c225d48395508a8f9ffa6e08cbddc5b.tar.xz util-linux-803b3a091c225d48395508a8f9ffa6e08cbddc5b.zip | |
Merging upstream version 2.40.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'libfdisk')
| -rw-r--r-- | libfdisk/docs/version.xml | 2 | ||||
| -rw-r--r-- | libfdisk/meson.build | 4 | ||||
| -rw-r--r-- | libfdisk/src/dos.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libfdisk/docs/version.xml b/libfdisk/docs/version.xml index 4bdd32f..0e1a032 100644 --- a/libfdisk/docs/version.xml +++ b/libfdisk/docs/version.xml @@ -1 +1 @@ -2.40 +2.40.1 diff --git a/libfdisk/meson.build b/libfdisk/meson.build index eaab9e1..57dda5c 100644 --- a/libfdisk/meson.build +++ b/libfdisk/meson.build @@ -60,8 +60,8 @@ lib_fdisk_static = static_library( 'fdisk_static', link_whole : lib__fdisk, link_with : [lib_common, - lib_blkid.get_static_lib(), lib_uuid.get_static_lib()], + dependencies : [blkid_static_dep], install : false) lib_fdisk = library( @@ -71,8 +71,8 @@ lib_fdisk = library( version : libfdisk_version, link_args : ['-Wl,--version-script=@0@'.format(libfdisk_sym_path)], link_with : [lib_common, - lib_blkid, lib_uuid], + dependencies : [blkid_dep], install : build_libfdisk) fdisk_dep = declare_dependency(link_with: lib_fdisk, include_directories: '.') diff --git a/libfdisk/src/dos.c b/libfdisk/src/dos.c index ecf0b36..5c00164 100644 --- a/libfdisk/src/dos.c +++ b/libfdisk/src/dos.c @@ -790,7 +790,7 @@ static void get_partition_table_geometry(struct fdisk_context *cxt, unsigned int *ph, unsigned int *ps) { unsigned char *bufp = cxt->firstsector; - struct { unsigned int c, h, o, v; } t[8]; + struct { unsigned int c, h, o, v; } t[8] = { 0 }; unsigned int n1, n2, n3, n4, n5, n6; const struct dos_partition *p; unsigned int c, h, s, l; |