summaryrefslogtreecommitdiff
path: root/e2fsprogs/blkid
diff options
context:
space:
mode:
author"Vladimir N. Oleynik"2005-09-19 13:48:39 +0000
committer"Vladimir N. Oleynik"2005-09-19 13:48:39 +0000
commitb71e6024f9ac1bf2c8068a20c93af6a0be630a11 (patch)
tree950358988089069ceae599d89faf0d3e1e5833b6 /e2fsprogs/blkid
parent54deebf4e41fd8cee3b5800a08844adc985d2c03 (diff)
downloadbusybox-b71e6024f9ac1bf2c8068a20c93af6a0be630a11.zip
busybox-b71e6024f9ac1bf2c8068a20c93af6a0be630a11.tar.gz
mke2fs.c can compiled for me, more bb_xstrdup and bb_xasprintf usage, remove 1 exporing, ext2fs_llseek/blkid_llseek->llseek
Diffstat (limited to 'e2fsprogs/blkid')
-rw-r--r--e2fsprogs/blkid/blkidP.h15
-rw-r--r--e2fsprogs/blkid/blkid_getsize.c (renamed from e2fsprogs/blkid/getsize.c)0
2 files changed, 10 insertions, 5 deletions
diff --git a/e2fsprogs/blkid/blkidP.h b/e2fsprogs/blkid/blkidP.h
index 1bb9490..43b4f0f 100644
--- a/e2fsprogs/blkid/blkidP.h
+++ b/e2fsprogs/blkid/blkidP.h
@@ -93,7 +93,7 @@ struct blkid_struct_cache
struct list_head bic_devs; /* List head of all devices */
struct list_head bic_tags; /* List head of all tag types */
time_t bic_time; /* Last probe time */
- time_t bic_ftime; /* Mod time of the cachefile */
+ time_t bic_ftime; /* Mod time of the cachefile */
unsigned int bic_flags; /* Status flags of the cache */
char *bic_filename; /* filename of cache */
};
@@ -141,7 +141,7 @@ extern const char *blkid_devdirs[];
#ifdef CONFIG_BLKID_DEBUG
#include <stdio.h>
-extern int blkid_debug_mask;
+extern int blkid_debug_mask;
#define DBG(m,x) if ((m) & blkid_debug_mask) x;
#else
#define DBG(m,x)
@@ -152,7 +152,7 @@ static inline void DEB_DUMP_TAG(int mask, blkid_tag tag)
{
if (!(mask & blkid_debug_mask))
return;
-
+
if (!tag) {
printf(" tag: NULL\n");
return;
@@ -167,7 +167,7 @@ static inline void DEB_DUMP_DEV(int mask, blkid_dev dev)
if (!(mask & blkid_debug_mask))
return;
-
+
if (!dev) {
printf(" dev: NULL\n");
return;
@@ -210,7 +210,12 @@ static inline void DEB_DUMP_CACHE(int mask, blkid_cache cache)
#endif
/* lseek.c */
-extern blkid_loff_t blkid_llseek(int fd, blkid_loff_t offset, int whence);
+/* extern blkid_loff_t blkid_llseek(int fd, blkid_loff_t offset, int whence); */
+#ifdef CONFIG_LFS
+# define blkid_llseek lseek64
+#else
+# define blkid_llseek lseek
+#endif
/* read.c */
extern void blkid_read_cache(blkid_cache cache);
diff --git a/e2fsprogs/blkid/getsize.c b/e2fsprogs/blkid/blkid_getsize.c
index 9458c08..9458c08 100644
--- a/e2fsprogs/blkid/getsize.c
+++ b/e2fsprogs/blkid/blkid_getsize.c