summaryrefslogtreecommitdiffstats
path: root/daemon
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2012-07-12 16:38:57 +0100
committerRichard W.M. Jones <rjones@redhat.com>2012-07-14 13:08:21 +0100
commit95d26f02405c090f886fc2c47a9e51ca37f9c09e (patch)
treea02f6d76a67c34f9047c185153a6d228a68046b4 /daemon
parente055bf4caba24fd24153984770ffe71b42003f76 (diff)
downloadlibguestfs-95d26f02405c090f886fc2c47a9e51ca37f9c09e.tar.gz
libguestfs-95d26f02405c090f886fc2c47a9e51ca37f9c09e.tar.xz
libguestfs-95d26f02405c090f886fc2c47a9e51ca37f9c09e.zip
generator: Rename 'ntfsresize_opts' API to 'ntfsresize'.
By using the once_had_no_optargs flag, this change is backwards compatible for callers.
Diffstat (limited to 'daemon')
-rw-r--r--daemon/ntfs.c16
1 files changed, 5 insertions, 11 deletions
diff --git a/daemon/ntfs.c b/daemon/ntfs.c
index 235ecbcd..2dedc268 100644
--- a/daemon/ntfs.c
+++ b/daemon/ntfs.c
@@ -64,7 +64,7 @@ do_ntfs_3g_probe (int rw, const char *device)
/* Takes optional arguments, consult optargs_bitmask. */
int
-do_ntfsresize_opts (const char *device, int64_t size, int force)
+do_ntfsresize (const char *device, int64_t size, int force)
{
char *err;
int r;
@@ -75,7 +75,7 @@ do_ntfsresize_opts (const char *device, int64_t size, int force)
ADD_ARG (argv, i, "ntfsresize");
ADD_ARG (argv, i, "-P");
- if (optargs_bitmask & GUESTFS_NTFSRESIZE_OPTS_SIZE_BITMASK) {
+ if (optargs_bitmask & GUESTFS_NTFSRESIZE_SIZE_BITMASK) {
if (size <= 0) {
reply_with_error ("size is zero or negative");
return -1;
@@ -86,7 +86,7 @@ do_ntfsresize_opts (const char *device, int64_t size, int force)
ADD_ARG (argv, i, size_str);
}
- if (optargs_bitmask & GUESTFS_NTFSRESIZE_OPTS_FORCE_BITMASK && force)
+ if (optargs_bitmask & GUESTFS_NTFSRESIZE_FORCE_BITMASK && force)
ADD_ARG (argv, i, "--force");
ADD_ARG (argv, i, device);
@@ -104,16 +104,10 @@ do_ntfsresize_opts (const char *device, int64_t size, int force)
}
int
-do_ntfsresize (const char *device)
-{
- return do_ntfsresize_opts (device, 0, 0);
-}
-
-int
do_ntfsresize_size (const char *device, int64_t size)
{
- optargs_bitmask = GUESTFS_NTFSRESIZE_OPTS_SIZE_BITMASK;
- return do_ntfsresize_opts (device, size, 0);
+ optargs_bitmask = GUESTFS_NTFSRESIZE_SIZE_BITMASK;
+ return do_ntfsresize (device, size, 0);
}
/* Takes optional arguments, consult optargs_bitmask. */