aboutsummaryrefslogtreecommitdiff
path: root/e2fsprogs/blkid
diff options
context:
space:
mode:
author"Vladimir N. Oleynik" <dzo@simtreas.ru>2005-09-19 13:48:39 +0000
committer"Vladimir N. Oleynik" <dzo@simtreas.ru>2005-09-19 13:48:39 +0000
commitb71e6024f9ac1bf2c8068a20c93af6a0be630a11 (patch)
tree950358988089069ceae599d89faf0d3e1e5833b6 /e2fsprogs/blkid
parent54deebf4e41fd8cee3b5800a08844adc985d2c03 (diff)
downloadbusybox-w32-b71e6024f9ac1bf2c8068a20c93af6a0be630a11.tar.gz
busybox-w32-b71e6024f9ac1bf2c8068a20c93af6a0be630a11.tar.bz2
busybox-w32-b71e6024f9ac1bf2c8068a20c93af6a0be630a11.zip
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 1bb94907e..43b4f0f53 100644
--- a/e2fsprogs/blkid/blkidP.h
+++ b/e2fsprogs/blkid/blkidP.h
@@ -93,7 +93,7 @@ struct blkid_struct_cache
93 struct list_head bic_devs; /* List head of all devices */ 93 struct list_head bic_devs; /* List head of all devices */
94 struct list_head bic_tags; /* List head of all tag types */ 94 struct list_head bic_tags; /* List head of all tag types */
95 time_t bic_time; /* Last probe time */ 95 time_t bic_time; /* Last probe time */
96 time_t bic_ftime; /* Mod time of the cachefile */ 96 time_t bic_ftime; /* Mod time of the cachefile */
97 unsigned int bic_flags; /* Status flags of the cache */ 97 unsigned int bic_flags; /* Status flags of the cache */
98 char *bic_filename; /* filename of cache */ 98 char *bic_filename; /* filename of cache */
99}; 99};
@@ -141,7 +141,7 @@ extern const char *blkid_devdirs[];
141 141
142#ifdef CONFIG_BLKID_DEBUG 142#ifdef CONFIG_BLKID_DEBUG
143#include <stdio.h> 143#include <stdio.h>
144extern int blkid_debug_mask; 144extern int blkid_debug_mask;
145#define DBG(m,x) if ((m) & blkid_debug_mask) x; 145#define DBG(m,x) if ((m) & blkid_debug_mask) x;
146#else 146#else
147#define DBG(m,x) 147#define DBG(m,x)
@@ -152,7 +152,7 @@ static inline void DEB_DUMP_TAG(int mask, blkid_tag tag)
152{ 152{
153 if (!(mask & blkid_debug_mask)) 153 if (!(mask & blkid_debug_mask))
154 return; 154 return;
155 155
156 if (!tag) { 156 if (!tag) {
157 printf(" tag: NULL\n"); 157 printf(" tag: NULL\n");
158 return; 158 return;
@@ -167,7 +167,7 @@ static inline void DEB_DUMP_DEV(int mask, blkid_dev dev)
167 167
168 if (!(mask & blkid_debug_mask)) 168 if (!(mask & blkid_debug_mask))
169 return; 169 return;
170 170
171 if (!dev) { 171 if (!dev) {
172 printf(" dev: NULL\n"); 172 printf(" dev: NULL\n");
173 return; 173 return;
@@ -210,7 +210,12 @@ static inline void DEB_DUMP_CACHE(int mask, blkid_cache cache)
210#endif 210#endif
211 211
212/* lseek.c */ 212/* lseek.c */
213extern blkid_loff_t blkid_llseek(int fd, blkid_loff_t offset, int whence); 213/* extern blkid_loff_t blkid_llseek(int fd, blkid_loff_t offset, int whence); */
214#ifdef CONFIG_LFS
215# define blkid_llseek lseek64
216#else
217# define blkid_llseek lseek
218#endif
214 219
215/* read.c */ 220/* read.c */
216extern void blkid_read_cache(blkid_cache cache); 221extern void blkid_read_cache(blkid_cache cache);
diff --git a/e2fsprogs/blkid/getsize.c b/e2fsprogs/blkid/blkid_getsize.c
index 9458c08bf..9458c08bf 100644
--- a/e2fsprogs/blkid/getsize.c
+++ b/e2fsprogs/blkid/blkid_getsize.c