mirror of
https://github.com/kdave/btrfs-progs
synced 2025-03-25 04:16:32 +00:00
btrfs-progs: autoconf: use standard PACKAGE_* macros
- use standard PACKAGE_{NAME,VERSION,STRING,URL,...} autoconf macros rather than homemade BTRFS_BUILD_VERSION - don't #include version.h, now the file is necessary for library API only Note that "btrfs version" returns "btrfs-progs <version>" instead of the original confusing "btrfs <version>". Signed-off-by: Karel Zak <kzak@redhat.com> Signed-off-by: David Sterba <dsterba@suse.cz>
This commit is contained in:
parent
bb6b4fea9f
commit
33f2d6b84d
@ -31,7 +31,6 @@
|
||||
#include "print-tree.h"
|
||||
#include "transaction.h"
|
||||
#include "list.h"
|
||||
#include "version.h"
|
||||
#include "volumes.h"
|
||||
#include "utils.h"
|
||||
|
||||
|
@ -28,7 +28,6 @@
|
||||
#include "print-tree.h"
|
||||
#include "transaction.h"
|
||||
#include "list.h"
|
||||
#include "version.h"
|
||||
#include "utils.h"
|
||||
|
||||
#define FIELD_BUF_LEN 80
|
||||
|
@ -26,7 +26,6 @@
|
||||
#include "disk-io.h"
|
||||
#include "print-tree.h"
|
||||
#include "transaction.h"
|
||||
#include "version.h"
|
||||
#include "utils.h"
|
||||
|
||||
static int print_usage(void)
|
||||
@ -43,7 +42,7 @@ static int print_usage(void)
|
||||
" only\n");
|
||||
fprintf(stderr,
|
||||
"\t-t tree_id : print only the tree with the given id\n");
|
||||
fprintf(stderr, "%s\n", BTRFS_BUILD_VERSION);
|
||||
fprintf(stderr, "%s\n", PACKAGE_STRING);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
@ -413,7 +412,7 @@ no_node:
|
||||
uuidbuf[BTRFS_UUID_UNPARSED_SIZE - 1] = '\0';
|
||||
uuid_unparse(info->super_copy->fsid, uuidbuf);
|
||||
printf("uuid %s\n", uuidbuf);
|
||||
printf("%s\n", BTRFS_BUILD_VERSION);
|
||||
printf("%s\n", PACKAGE_STRING);
|
||||
close_root:
|
||||
return close_ctree(root);
|
||||
}
|
||||
|
@ -28,7 +28,6 @@
|
||||
#include "print-tree.h"
|
||||
#include "transaction.h"
|
||||
#include "list.h"
|
||||
#include "version.h"
|
||||
#include "volumes.h"
|
||||
#include "utils.h"
|
||||
#include "crc32c.h"
|
||||
|
@ -31,7 +31,6 @@
|
||||
#include "disk-io.h"
|
||||
#include "transaction.h"
|
||||
#include "utils.h"
|
||||
#include "version.h"
|
||||
#include "volumes.h"
|
||||
#include "extent_io.h"
|
||||
|
||||
|
@ -28,7 +28,6 @@
|
||||
#include "print-tree.h"
|
||||
#include "transaction.h"
|
||||
#include "list.h"
|
||||
#include "version.h"
|
||||
#include "utils.h"
|
||||
|
||||
/* we write the mirror info to stdout unless they are dumping the data
|
||||
|
@ -27,13 +27,12 @@
|
||||
#include "print-tree.h"
|
||||
#include "transaction.h"
|
||||
#include "list.h"
|
||||
#include "version.h"
|
||||
#include "utils.h"
|
||||
|
||||
static void print_usage(void)
|
||||
{
|
||||
fprintf(stderr, "usage: btrfs-select-super -s number dev\n");
|
||||
fprintf(stderr, "%s\n", BTRFS_BUILD_VERSION);
|
||||
fprintf(stderr, "%s\n", PACKAGE_STRING);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
|
@ -31,7 +31,6 @@
|
||||
#include "print-tree.h"
|
||||
#include "transaction.h"
|
||||
#include "list.h"
|
||||
#include "version.h"
|
||||
#include "utils.h"
|
||||
#include "crc32c.h"
|
||||
|
||||
@ -49,7 +48,7 @@ static void print_usage(void)
|
||||
fprintf(stderr, "\t-a : print information of all superblocks\n");
|
||||
fprintf(stderr, "\t-i <super_mirror> : specify which mirror to print out\n");
|
||||
fprintf(stderr, "\t-F : attempt to dump superblocks with bad magic\n");
|
||||
fprintf(stderr, "%s\n", BTRFS_BUILD_VERSION);
|
||||
fprintf(stderr, "%s\n", PACKAGE_STRING);
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
|
@ -27,14 +27,13 @@
|
||||
#include "print-tree.h"
|
||||
#include "transaction.h"
|
||||
#include "list.h"
|
||||
#include "version.h"
|
||||
#include "utils.h"
|
||||
|
||||
static void print_usage(void) __attribute__((noreturn));
|
||||
static void print_usage(void)
|
||||
{
|
||||
fprintf(stderr, "usage: btrfs-zero-log dev\n");
|
||||
fprintf(stderr, "%s\n", BTRFS_BUILD_VERSION);
|
||||
fprintf(stderr, "%s\n", PACKAGE_STRING);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
|
3
btrfs.c
3
btrfs.c
@ -20,7 +20,6 @@
|
||||
|
||||
#include "crc32c.h"
|
||||
#include "commands.h"
|
||||
#include "version.h"
|
||||
#include "utils.h"
|
||||
|
||||
static const char * const btrfs_cmd_group_usage[] = {
|
||||
@ -168,7 +167,7 @@ static const char * const cmd_version_usage[] = {
|
||||
|
||||
static int cmd_version(int argc, char **argv)
|
||||
{
|
||||
printf("%s\n", BTRFS_BUILD_VERSION);
|
||||
printf("%s\n", PACKAGE_STRING);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -28,7 +28,6 @@
|
||||
#include "disk-io.h"
|
||||
#include "transaction.h"
|
||||
#include "utils.h"
|
||||
#include "version.h"
|
||||
|
||||
static char *device;
|
||||
static int force = 0;
|
||||
|
@ -36,7 +36,6 @@
|
||||
#include "transaction.h"
|
||||
#include "crc32c.h"
|
||||
#include "utils.h"
|
||||
#include "version.h"
|
||||
#include "btrfsck.h"
|
||||
#include "commands.h"
|
||||
|
||||
|
@ -31,7 +31,6 @@
|
||||
#include "disk-io.h"
|
||||
#include "print-tree.h"
|
||||
#include "transaction.h"
|
||||
#include "version.h"
|
||||
#include "utils.h"
|
||||
#include "commands.h"
|
||||
#include "free-space-cache.h"
|
||||
@ -8749,7 +8748,7 @@ out:
|
||||
printf("file data blocks allocated: %llu\n referenced %llu\n",
|
||||
(unsigned long long)data_bytes_allocated,
|
||||
(unsigned long long)data_bytes_referenced);
|
||||
printf("%s\n", BTRFS_BUILD_VERSION);
|
||||
printf("%s\n", PACKAGE_STRING);
|
||||
|
||||
free_root_recs_tree(&root_cache);
|
||||
close_out:
|
||||
|
@ -33,7 +33,6 @@
|
||||
#include "ioctl.h"
|
||||
#include "utils.h"
|
||||
#include "volumes.h"
|
||||
#include "version.h"
|
||||
#include "commands.h"
|
||||
#include "cmds-fi-disk_usage.h"
|
||||
#include "list_sort.h"
|
||||
@ -957,7 +956,7 @@ devs_only:
|
||||
free_fs_devices(fs_devices);
|
||||
}
|
||||
out:
|
||||
printf("%s\n", BTRFS_BUILD_VERSION);
|
||||
printf("%s\n", PACKAGE_STRING);
|
||||
free_seen_fsid();
|
||||
return ret;
|
||||
}
|
||||
@ -1213,7 +1212,7 @@ static int cmd_defrag(int argc, char **argv)
|
||||
}
|
||||
}
|
||||
if (defrag_global_verbose)
|
||||
printf("%s\n", BTRFS_BUILD_VERSION);
|
||||
printf("%s\n", PACKAGE_STRING);
|
||||
if (defrag_global_errors)
|
||||
fprintf(stderr, "total %d failures\n", defrag_global_errors);
|
||||
|
||||
|
@ -39,7 +39,6 @@
|
||||
#include "print-tree.h"
|
||||
#include "transaction.h"
|
||||
#include "list.h"
|
||||
#include "version.h"
|
||||
#include "volumes.h"
|
||||
#include "utils.h"
|
||||
#include "commands.h"
|
||||
|
9
mkfs.c
9
mkfs.c
@ -41,7 +41,6 @@
|
||||
#include "volumes.h"
|
||||
#include "transaction.h"
|
||||
#include "utils.h"
|
||||
#include "version.h"
|
||||
|
||||
static u64 index_cnt = 2;
|
||||
|
||||
@ -290,14 +289,14 @@ static void print_usage(void)
|
||||
fprintf(stderr, "\t -O --features comma separated list of filesystem features\n");
|
||||
fprintf(stderr, "\t -U --uuid specify the filesystem UUID\n");
|
||||
fprintf(stderr, "\t -V --version print the mkfs.btrfs version and exit\n");
|
||||
fprintf(stderr, "%s\n", BTRFS_BUILD_VERSION);
|
||||
fprintf(stderr, "%s\n", PACKAGE_STRING);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
static void print_version(void) __attribute__((noreturn));
|
||||
static void print_version(void)
|
||||
{
|
||||
fprintf(stderr, "mkfs.btrfs, part of %s\n", BTRFS_BUILD_VERSION);
|
||||
fprintf(stderr, "mkfs.btrfs, part of %s\n", PACKAGE_STRING);
|
||||
exit(0);
|
||||
}
|
||||
|
||||
@ -1489,8 +1488,8 @@ int main(int ac, char **av)
|
||||
}
|
||||
|
||||
/* if we are here that means all devs are good to btrfsify */
|
||||
printf("%s\n", BTRFS_BUILD_VERSION);
|
||||
printf("See http://btrfs.wiki.kernel.org for more information.\n\n");
|
||||
printf("%s\n", PACKAGE_STRING);
|
||||
printf("See %s for more information.\n\n", PACKAGE_URL);
|
||||
|
||||
dev_cnt--;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user