aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrelan <relan@users.noreply.github.com>2015-06-29 15:32:49 +0300
committerrelan <relan@users.noreply.github.com>2015-08-26 11:50:43 +0300
commitc50537e1485c82e58651985c8b43a4bfa3cc3a3d (patch)
treed79fd4e2b26782227abf4c265011315bff1f3496
parentc05a94a1d347abff3a80a3929b1814252571bde6 (diff)
downloadandroid_external_exfat-c50537e1485c82e58651985c8b43a4bfa3cc3a3d.tar.gz
android_external_exfat-c50537e1485c82e58651985c8b43a4bfa3cc3a3d.tar.bz2
android_external_exfat-c50537e1485c82e58651985c8b43a4bfa3cc3a3d.zip
Drop version.h header.
Use VERSION define from config.h.
-rw-r--r--dump/main.c3
-rw-r--r--fsck/main.c3
-rw-r--r--fuse/main.c3
-rw-r--r--label/main.c3
-rw-r--r--libexfat/Makefile.am3
-rw-r--r--libexfat/exfat.h1
-rw-r--r--libexfat/version.h30
-rw-r--r--mkfs/main.c3
8 files changed, 6 insertions, 43 deletions
diff --git a/dump/main.c b/dump/main.c
index 8713f64..b6e0409 100644
--- a/dump/main.c
+++ b/dump/main.c
@@ -153,8 +153,7 @@ int main(int argc, char* argv[])
bool sb_only = false;
bool used_sectors = false;
- printf("dumpexfat %u.%u.%u\n",
- EXFAT_VERSION_MAJOR, EXFAT_VERSION_MINOR, EXFAT_VERSION_PATCH);
+ printf("dumpexfat %s\n", VERSION);
while ((opt = getopt(argc, argv, "suV")) != -1)
{
diff --git a/fsck/main.c b/fsck/main.c
index b3709ce..ded76b2 100644
--- a/fsck/main.c
+++ b/fsck/main.c
@@ -140,8 +140,7 @@ int main(int argc, char* argv[])
const char* spec = NULL;
struct exfat ef;
- printf("exfatfsck %u.%u.%u\n",
- EXFAT_VERSION_MAJOR, EXFAT_VERSION_MINOR, EXFAT_VERSION_PATCH);
+ printf("exfatfsck %s\n", VERSION);
while ((opt = getopt(argc, argv, "V")) != -1)
{
diff --git a/fuse/main.c b/fuse/main.c
index 5370359..030362e 100644
--- a/fuse/main.c
+++ b/fuse/main.c
@@ -480,8 +480,7 @@ int main(int argc, char* argv[])
struct fuse* fh = NULL;
int opt;
- printf("FUSE exfat %u.%u.%u\n",
- EXFAT_VERSION_MAJOR, EXFAT_VERSION_MINOR, EXFAT_VERSION_PATCH);
+ printf("FUSE exfat %s\n", VERSION);
mount_options = strdup(default_options);
if (mount_options == NULL)
diff --git a/label/main.c b/label/main.c
index f2bca13..b219d4e 100644
--- a/label/main.c
+++ b/label/main.c
@@ -33,8 +33,7 @@ int main(int argc, char* argv[])
for (pp = argv + 1; *pp; pp++)
if (strcmp(*pp, "-V") == 0)
{
- printf("exfatlabel %u.%u.%u\n", EXFAT_VERSION_MAJOR,
- EXFAT_VERSION_MINOR, EXFAT_VERSION_PATCH);
+ printf("exfatlabel %s\n", VERSION);
puts("Copyright (C) 2011-2015 Andrew Nayenko");
return 0;
}
diff --git a/libexfat/Makefile.am b/libexfat/Makefile.am
index f59fa34..f9067e9 100644
--- a/libexfat/Makefile.am
+++ b/libexfat/Makefile.am
@@ -35,5 +35,4 @@ libexfat_a_SOURCES = \
platform.h \
time.c \
utf.c \
- utils.c \
- version.h
+ utils.c
diff --git a/libexfat/exfat.h b/libexfat/exfat.h
index a141c67..122ac5b 100644
--- a/libexfat/exfat.h
+++ b/libexfat/exfat.h
@@ -27,7 +27,6 @@
#include "config.h"
#include "compiler.h"
#include "exfatfs.h"
-#include "version.h"
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
diff --git a/libexfat/version.h b/libexfat/version.h
deleted file mode 100644
index dbfe6db..0000000
--- a/libexfat/version.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- version.h (12.06.10)
- Version constants.
-
- Free exFAT implementation.
- Copyright (C) 2010-2015 Andrew Nayenko
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-#ifndef VERSION_H_INCLUDED
-#define VERSION_H_INCLUDED
-
-#define EXFAT_VERSION_MAJOR 1
-#define EXFAT_VERSION_MINOR 1
-#define EXFAT_VERSION_PATCH 0
-
-#endif /* ifndef VERSION_H_INCLUDED */
diff --git a/mkfs/main.c b/mkfs/main.c
index eee51f1..2ee6da6 100644
--- a/mkfs/main.c
+++ b/mkfs/main.c
@@ -204,8 +204,7 @@ int main(int argc, char* argv[])
uint64_t first_sector = 0;
struct exfat_dev* dev;
- printf("mkexfatfs %u.%u.%u\n",
- EXFAT_VERSION_MAJOR, EXFAT_VERSION_MINOR, EXFAT_VERSION_PATCH);
+ printf("mkexfatfs %s\n", VERSION);
while ((opt = getopt(argc, argv, "i:n:p:s:V")) != -1)
{