RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-02-16 09:46:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: move a union with variable sized type to the end

Browse Source 
[WARNING]
Clang 15.0.7 gives the following warning:

  image/main.c:95:2: warning: field '' with variable sized type 'union metadump_struct::(anonymous at image/main.c:95:2)' not at the end of a struct or class is a GNU extension [-Wgnu-variable-sized-type-not-at-end]
          union {
          ^

[CAUSE]
The union contains meta_cluster, which variable sized:

  struct meta_cluster {
  	struct meta_cluster_header header;
  	struct meta_cluster_item items[];
  } __attribute__ ((__packed__));

Thus clang gives above warning since it's a GNU extension.

[FIX]
Just move the union to the end of the structure.

Signed-off-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Qu Wenruo 2023-01-27 13:41:17 +08:00 committed by David Sterba
parent 3a1d4aa089
commit c3a41e5d4c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
image/main.c
View File

@ -93,11 +93,6 @@ struct metadump_struct {
struct btrfs_root *root; struct btrfs_root *root;
FILE *out; FILE *out;
union {
struct meta_cluster cluster;
char meta_cluster_bytes[IMAGE_BLOCK_SIZE];
};
pthread_t threads[MAX_WORKER_THREADS]; pthread_t threads[MAX_WORKER_THREADS];
size_t num_threads; size_t num_threads;
pthread_mutex_t mutex; pthread_mutex_t mutex;
@ -120,6 +115,11 @@ struct metadump_struct {
enum sanitize_mode sanitize_names; enum sanitize_mode sanitize_names;
int error; int error;
union {
struct meta_cluster cluster;
char meta_cluster_bytes[IMAGE_BLOCK_SIZE];
};
}; };
struct mdrestore_struct { struct mdrestore_struct {