aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrpjday <rpjday@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-07-03 18:11:39 +0000
committerrpjday <rpjday@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-07-03 18:11:39 +0000
commit2c91a038489c908d9122b213c76423adb6be885d (patch)
tree69a80ffd23ee2fe5fde09707b019925add623727
parent2c8ffb6971117bad4d8bf95ea756af94e31eeba9 (diff)
downloadbusybox-w32-2c91a038489c908d9122b213c76423adb6be885d.tar.gz
busybox-w32-2c91a038489c908d9122b213c76423adb6be885d.tar.bz2
busybox-w32-2c91a038489c908d9122b213c76423adb6be885d.zip
Delete unused version.c file and corresponding function prototypes
from blkid.h. If this file needs to be resurrected, it can be based on ext2fs/version.c. git-svn-id: svn://busybox.net/trunk/busybox@15587 69ca8d6d-28ef-0310-b511-8ec308f3f277
-rw-r--r--e2fsprogs/blkid/blkid.h5
-rw-r--r--e2fsprogs/blkid/version.c49
2 files changed, 0 insertions, 54 deletions
diff --git a/e2fsprogs/blkid/blkid.h b/e2fsprogs/blkid/blkid.h
index 979565e39..54721b221 100644
--- a/e2fsprogs/blkid/blkid.h
+++ b/e2fsprogs/blkid/blkid.h
@@ -98,11 +98,6 @@ extern blkid_dev blkid_find_dev_with_tag(blkid_cache cache,
98extern int blkid_parse_tag_string(const char *token, char **ret_type, 98extern int blkid_parse_tag_string(const char *token, char **ret_type,
99 char **ret_val); 99 char **ret_val);
100 100
101/* version.c */
102extern int blkid_parse_version_string(const char *ver_string);
103extern int blkid_get_library_version(const char **ver_string,
104 const char **date_string);
105
106#ifdef __cplusplus 101#ifdef __cplusplus
107} 102}
108#endif 103#endif
diff --git a/e2fsprogs/blkid/version.c b/e2fsprogs/blkid/version.c
deleted file mode 100644
index d076de04d..000000000
--- a/e2fsprogs/blkid/version.c
+++ /dev/null
@@ -1,49 +0,0 @@
1/* vi: set sw=4 ts=4: */
2/*
3 * version.c --- Return the version of the blkid library
4 *
5 * Copyright (C) 2004 Theodore Ts'o.
6 *
7 * %Begin-Header%
8 * This file may be redistributed under the terms of the GNU Public
9 * License.
10 * %End-Header%
11 */
12
13#if HAVE_UNISTD_H
14#include <unistd.h>
15#endif
16#include <string.h>
17#include <stdio.h>
18#include <ctype.h>
19
20#include "blkid.h"
21
22static const char *lib_version = E2FSPROGS_VERSION;
23static const char *lib_date = E2FSPROGS_DATE;
24
25int blkid_parse_version_string(const char *ver_string)
26{
27 const char *cp;
28 int version = 0;
29
30 for (cp = ver_string; *cp; cp++) {
31 if (*cp == '.')
32 continue;
33 if (!isdigit(*cp))
34 break;
35 version = (version * 10) + (*cp - '0');
36 }
37 return version;
38}
39
40int blkid_get_library_version(const char **ver_string,
41 const char **date_string)
42{
43 if (ver_string)
44 *ver_string = lib_version;
45 if (date_string)
46 *date_string = lib_date;
47
48 return blkid_parse_version_string(lib_version);
49}