xfsprogs: Release v6.10.1

[thirdparty/xfsprogs-dev.git] / rtcp / xfs_rtcp.c

diff --git a/rtcp/xfs_rtcp.c b/rtcp/xfs_rtcp.c
index a77561d38b06c203716b021647d6e56e1eda4fe3..7c4197b1314ceb1a6e6d8075ab6d0582da2eb459 100644 (file)
--- a/rtcp/xfs_rtcp.c
+++ b/rtcp/xfs_rtcp.c
@@ -5,14 +5,15 @@
  */
 
 #include "libxfs.h"
+#include "libfrog/fsgeom.h"
 
 int rtcp(char *, char *, int);
 int xfsrtextsize(char *path);
 
-int pflag;
+static int pflag;
 char *progname;
 
-void
+static void
 usage(void)
 {
        fprintf(stderr, _("%s [-e extsize] [-p] [-V] source target\n"), progname);
@@ -368,8 +369,8 @@ rtcp( char *source, char *target, int fextsize)
 int
 xfsrtextsize( char *path)
 {
-       int fd, rval, rtextsize;
-       xfs_fsop_geom_v1_t geo;
+       struct xfs_fsop_geom    geo;
+       int                     fd, rval, rtextsize;
 
        fd = open( path, O_RDONLY );
        if ( fd < 0 ) {
@@ -377,9 +378,9 @@ xfsrtextsize( char *path)
                        progname, path, strerror(errno));
                return -1;
        }
-       rval = xfsctl( path, fd, XFS_IOC_FSGEOMETRY_V1, &geo );
+       rval = -xfrog_geometry(fd, &geo);
        close(fd);
-       if ( rval < 0 )
+       if (rval)
                return -1;
 
        rtextsize = geo.rtextsize * geo.blocksize;