[Ocfs-tools-commits] manish commits r40 - in trunk: debugocfs ocfstool

[svn-commits at oss.oracle.com]

Author: manish
Date: 2004-05-20 21:51:39 -0500 (Thu, 20 May 2004)
New Revision: 40

Modified:
   trunk/debugocfs/libdebugocfs.c
   trunk/debugocfs/libdebugocfs.h
   trunk/ocfstool/ocfsbitmap.c
   trunk/ocfstool/ocfsfreespace.c
Log:
libocfs_get_bitmap takes an unsigned char, so we are compliant with
c99 aliasing rules


Modified: trunk/debugocfs/libdebugocfs.c
===================================================================
--- trunk/debugocfs/libdebugocfs.c	2004-05-21 02:50:51 UTC (rev 39)
+++ trunk/debugocfs/libdebugocfs.c	2004-05-21 02:51:39 UTC (rev 40)
@@ -143,7 +143,7 @@
     return 0;
 }
 
-int libocfs_get_bitmap(const char *dev, char **bmap, int *numbits)
+int libocfs_get_bitmap(const char *dev, unsigned char **bmap, int *numbits)
 {
     int fd;
     __u64 readlen;

Modified: trunk/debugocfs/libdebugocfs.h
===================================================================
--- trunk/debugocfs/libdebugocfs.h	2004-05-21 02:50:51 UTC (rev 39)
+++ trunk/debugocfs/libdebugocfs.h	2004-05-21 02:51:39 UTC (rev 40)
@@ -74,7 +74,7 @@
 
 int libocfs_readdir(const char *dev, const char *dir, int recurse,
 		    GArray ** arr);
-int libocfs_get_bitmap(const char *dev, char **bmap, int *numbits);
+int libocfs_get_bitmap(const char *dev, unsigned char **bmap, int *numbits);
 int libocfs_get_volume_info(const char *dev, libocfs_volinfo ** info);
 int libocfs_is_ocfs_partition(const char *dev);
 int libocfs_chown_volume(const char *dev, int protection, int uid, int gid);

Modified: trunk/ocfstool/ocfsbitmap.c
===================================================================
--- trunk/ocfstool/ocfsbitmap.c	2004-05-21 02:50:51 UTC (rev 39)
+++ trunk/ocfstool/ocfsbitmap.c	2004-05-21 02:51:39 UTC (rev 40)
@@ -42,7 +42,7 @@
   gint        length, i;
   GByteArray *map;
 
-  if (device && libocfs_get_bitmap (device, (gchar **) &bits, &length) == 0)
+  if (device && libocfs_get_bitmap (device, &bits, &length) == 0)
     {
       scrl_win = gtk_widget_new (GTK_TYPE_SCROLLED_WINDOW,
 				 "hscrollbar_policy", GTK_POLICY_NEVER,

Modified: trunk/ocfstool/ocfsfreespace.c
===================================================================
--- trunk/ocfstool/ocfsfreespace.c	2004-05-21 02:50:51 UTC (rev 39)
+++ trunk/ocfstool/ocfsfreespace.c	2004-05-21 02:51:39 UTC (rev 40)
@@ -118,7 +118,7 @@
   gchar           *texts[2], buf[10];
 
   if (!device ||
-      libocfs_get_bitmap (device, (gchar **) &bits, &length) ||
+      libocfs_get_bitmap (device, &bits, &length) ||
       libocfs_get_volume_info (device, &info))
     return FALSE;