git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
appliance: Print uptime.
[libguestfs.git]
/
daemon
/
swap.c
diff --git
a/daemon/swap.c
b/daemon/swap.c
index
3ebdef6
..
bcc5f1b
100644
(file)
--- a/
daemon/swap.c
+++ b/
daemon/swap.c
@@
-28,7
+28,7
@@
#include "actions.h"
static int
#include "actions.h"
static int
-mkswap (char *device, const char *flag, const char *value)
+mkswap (c
onst c
har *device, const char *flag, const char *value)
{
char *err;
int r;
{
char *err;
int r;
@@
-50,38
+50,29
@@
mkswap (char *device, const char *flag, const char *value)
}
int
}
int
-do_mkswap (char *device)
+do_mkswap (c
onst c
har *device)
{
{
- IS_DEVICE (device, -1);
-
return mkswap (device, NULL, NULL);
}
int
return mkswap (device, NULL, NULL);
}
int
-do_mkswap_L (c
har *label,
char *device)
+do_mkswap_L (c
onst char *label, const
char *device)
{
{
- IS_DEVICE (device, -1);
-
return mkswap (device, "-L", label);
}
int
return mkswap (device, "-L", label);
}
int
-do_mkswap_U (c
har *uuid,
char *device)
+do_mkswap_U (c
onst char *uuid, const
char *device)
{
{
- IS_DEVICE (device, -1);
-
return mkswap (device, "-U", uuid);
}
int
return mkswap (device, "-U", uuid);
}
int
-do_mkswap_file (char *path)
+do_mkswap_file (c
onst c
har *path)
{
char *buf;
int r;
{
char *buf;
int r;
- NEED_ROOT (-1);
- ABS_PATH (path, -1);
-
buf = sysroot_path (path);
if (!buf) {
reply_with_perror ("malloc");
buf = sysroot_path (path);
if (!buf) {
reply_with_perror ("malloc");
@@
-116,30
+107,23
@@
swaponoff (const char *cmd, const char *flag, const char *value)
}
int
}
int
-do_swapon_device (char *device)
+do_swapon_device (c
onst c
har *device)
{
{
- IS_DEVICE (device, -1);
-
return swaponoff ("/sbin/swapon", NULL, device);
}
int
return swaponoff ("/sbin/swapon", NULL, device);
}
int
-do_swapoff_device (char *device)
+do_swapoff_device (c
onst c
har *device)
{
{
- IS_DEVICE (device, -1);
-
return swaponoff ("/sbin/swapoff", NULL, device);
}
int
return swaponoff ("/sbin/swapoff", NULL, device);
}
int
-do_swapon_file (char *path)
+do_swapon_file (c
onst c
har *path)
{
char *buf;
int r;
{
char *buf;
int r;
- NEED_ROOT (-1);
- ABS_PATH (path, -1);
-
buf = sysroot_path (path);
if (!buf) {
reply_with_perror ("malloc");
buf = sysroot_path (path);
if (!buf) {
reply_with_perror ("malloc");
@@
-152,14
+136,11
@@
do_swapon_file (char *path)
}
int
}
int
-do_swapoff_file (char *path)
+do_swapoff_file (c
onst c
har *path)
{
char *buf;
int r;
{
char *buf;
int r;
- NEED_ROOT (-1);
- ABS_PATH (path, -1);
-
buf = sysroot_path (path);
if (!buf) {
reply_with_perror ("malloc");
buf = sysroot_path (path);
if (!buf) {
reply_with_perror ("malloc");
@@
-172,25
+153,25
@@
do_swapoff_file (char *path)
}
int
}
int
-do_swapon_label (char *label)
+do_swapon_label (c
onst c
har *label)
{
return swaponoff ("/sbin/swapon", "-L", label);
}
int
{
return swaponoff ("/sbin/swapon", "-L", label);
}
int
-do_swapoff_label (char *label)
+do_swapoff_label (c
onst c
har *label)
{
return swaponoff ("/sbin/swapoff", "-L", label);
}
int
{
return swaponoff ("/sbin/swapoff", "-L", label);
}
int
-do_swapon_uuid (char *uuid)
+do_swapon_uuid (c
onst c
har *uuid)
{
return swaponoff ("/sbin/swapon", "-U", uuid);
}
int
{
return swaponoff ("/sbin/swapon", "-U", uuid);
}
int
-do_swapoff_uuid (char *uuid)
+do_swapoff_uuid (c
onst c
har *uuid)
{
return swaponoff ("/sbin/swapoff", "-U", uuid);
}
{
return swaponoff ("/sbin/swapoff", "-U", uuid);
}