[Ocfs2-tools-commits] manish commits r756 - trunk/ocfs2console/blkid

[svn-commits at oss.oracle.com]

Author: manish
Date: 2005-03-28 17:23:28 -0600 (Mon, 28 Mar 2005)
New Revision: 756

Modified:
   trunk/ocfs2console/blkid/Makefile
   trunk/ocfs2console/blkid/cache.c
   trunk/ocfs2console/blkid/probe.c
Log:
Minor cleanups


Modified: trunk/ocfs2console/blkid/Makefile
===================================================================
--- trunk/ocfs2console/blkid/Makefile	2005-03-28 23:16:21 UTC (rev 755)
+++ trunk/ocfs2console/blkid/Makefile	2005-03-28 23:23:28 UTC (rev 756)
@@ -11,7 +11,8 @@
 CFLAGS = $(OPTS) $(WARNINGS) -fPIC
 CPPFLAGS = -DHAVE_UNISTD_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 \
 	-DHAVE_ERRNO_H=1 -DHAVE_SYS_IOCTL_H=1 -DHAVE_LINUX_FD_H=1 \
-	-DHAVE_SYS_QUEUE_H=1 -DHAVE_STDLIB_H=1 -DHAVE_LSEEK64=1
+	-DHAVE_SYS_QUEUE_H=1 -DHAVE_STDLIB_H=1 -DHAVE_LSEEK64=1 \
+	-DHAVE_LSEEK64_PROTOTYPE=1
 
 CFILES =		\
 	cache.c		\

Modified: trunk/ocfs2console/blkid/cache.c
===================================================================
--- trunk/ocfs2console/blkid/cache.c	2005-03-28 23:16:21 UTC (rev 755)
+++ trunk/ocfs2console/blkid/cache.c	2005-03-28 23:23:28 UTC (rev 756)
@@ -12,6 +12,12 @@
 
 #include <stdlib.h>
 #include <string.h>
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#if HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
 #include "blkidP.h"
 
 int blkid_debug_mask = 0;

Modified: trunk/ocfs2console/blkid/probe.c
===================================================================
--- trunk/ocfs2console/blkid/probe.c	2005-03-28 23:16:21 UTC (rev 755)
+++ trunk/ocfs2console/blkid/probe.c	2005-03-28 23:23:28 UTC (rev 756)
@@ -127,7 +127,6 @@
 		      struct blkid_magic *id, unsigned char *buf)
 {
 	struct ext2_super_block *es;
-	const char *sec_type = 0, *label = 0;
 
 	es = (struct ext2_super_block *)buf;
 
@@ -321,7 +320,6 @@
 		       unsigned char *buf __BLKID_ATTR((unused)))
 {
 	struct swap_id_block *sws;
-	const char *label = 0;
 
 	probe_swap0(fd, cache, dev, id, buf);
 	/*