diff options
author | Jim Meyering <meyering@redhat.com> | 2009-08-11 15:59:56 +0200 |
---|---|---|
committer | Jim Meyering <meyering@redhat.com> | 2009-08-13 14:45:34 +0200 |
commit | 84fc760439e82e6b3616abd0d1f9bd7d7eb01ec0 (patch) | |
tree | 5ac525b34b3bf5b3ef336f567c72cd8859b18ab6 /daemon/swap.c | |
parent | 79b5084f70cb67c37dd7cbe60821a78981fd8d59 (diff) | |
download | libguestfs-84fc760439e82e6b3616abd0d1f9bd7d7eb01ec0.tar.gz libguestfs-84fc760439e82e6b3616abd0d1f9bd7d7eb01ec0.tar.xz libguestfs-84fc760439e82e6b3616abd0d1f9bd7d7eb01ec0.zip |
generator.ml: use new "Pathname" designation
Nearly every file-related function in daemons/*.c is affected:
Remove this pair of statements from each affected do_* function:
- NEED_ROOT (return -1);
- ABS_PATH (dir, return -1);
and change the type of the corresponding parameter to "const char *".
* src/generator.ml: Emit NEED_ROOT just once, even when there are two or
more Pathname args.
Diffstat (limited to 'daemon/swap.c')
-rw-r--r-- | daemon/swap.c | 35 |
1 files changed, 13 insertions, 22 deletions
diff --git a/daemon/swap.c b/daemon/swap.c index 580482fc..bcc5f1b1 100644 --- a/daemon/swap.c +++ b/daemon/swap.c @@ -28,7 +28,7 @@ #include "actions.h" static int -mkswap (char *device, const char *flag, const char *value) +mkswap (const char *device, const char *flag, const char *value) { char *err; int r; @@ -50,32 +50,29 @@ mkswap (char *device, const char *flag, const char *value) } int -do_mkswap (char *device) +do_mkswap (const char *device) { return mkswap (device, NULL, NULL); } int -do_mkswap_L (char *label, char *device) +do_mkswap_L (const char *label, const char *device) { return mkswap (device, "-L", label); } int -do_mkswap_U (char *uuid, char *device) +do_mkswap_U (const char *uuid, const char *device) { return mkswap (device, "-U", uuid); } int -do_mkswap_file (char *path) +do_mkswap_file (const char *path) { char *buf; int r; - NEED_ROOT (return -1); - ABS_PATH (path, return -1); - buf = sysroot_path (path); if (!buf) { reply_with_perror ("malloc"); @@ -110,26 +107,23 @@ swaponoff (const char *cmd, const char *flag, const char *value) } int -do_swapon_device (char *device) +do_swapon_device (const char *device) { return swaponoff ("/sbin/swapon", NULL, device); } int -do_swapoff_device (char *device) +do_swapoff_device (const char *device) { return swaponoff ("/sbin/swapoff", NULL, device); } int -do_swapon_file (char *path) +do_swapon_file (const char *path) { char *buf; int r; - NEED_ROOT (return -1); - ABS_PATH (path, return -1); - buf = sysroot_path (path); if (!buf) { reply_with_perror ("malloc"); @@ -142,14 +136,11 @@ do_swapon_file (char *path) } int -do_swapoff_file (char *path) +do_swapoff_file (const char *path) { char *buf; int r; - NEED_ROOT (return -1); - ABS_PATH (path, return -1); - buf = sysroot_path (path); if (!buf) { reply_with_perror ("malloc"); @@ -162,25 +153,25 @@ do_swapoff_file (char *path) } int -do_swapon_label (char *label) +do_swapon_label (const char *label) { return swaponoff ("/sbin/swapon", "-L", label); } int -do_swapoff_label (char *label) +do_swapoff_label (const char *label) { return swaponoff ("/sbin/swapoff", "-L", label); } int -do_swapon_uuid (char *uuid) +do_swapon_uuid (const char *uuid) { return swaponoff ("/sbin/swapon", "-U", uuid); } int -do_swapoff_uuid (char *uuid) +do_swapoff_uuid (const char *uuid) { return swaponoff ("/sbin/swapoff", "-U", uuid); } |