diff options
| author | Jim Meyering <meyering@redhat.com> | 2009-08-10 18:54:51 +0200 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2009-08-13 14:45:33 +0200 |
| commit | e8795f3e9cc7e60a5ad709c0e3b53f60e37fd6c0 (patch) | |
| tree | ae0857fb52d722080b0263d6b73064db3ce99ed4 /daemon | |
| parent | 1997858e90da728287ef26a6d01a5766ac914312 (diff) | |
| download | libguestfs-e8795f3e9cc7e60a5ad709c0e3b53f60e37fd6c0.tar.gz libguestfs-e8795f3e9cc7e60a5ad709c0e3b53f60e37fd6c0.tar.xz libguestfs-e8795f3e9cc7e60a5ad709c0e3b53f60e37fd6c0.zip | |
convert the last few, manually
Diffstat (limited to 'daemon')
| -rw-r--r-- | daemon/daemon.h | 2 | ||||
| -rw-r--r-- | daemon/sfdisk.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/daemon/daemon.h b/daemon/daemon.h index 166f3bf9..bebc86f1 100644 --- a/daemon/daemon.h +++ b/daemon/daemon.h @@ -174,7 +174,7 @@ extern void reply (xdrproc_t xdrp, char *ret); #define NEED_ROOT_OR_IS_DEVICE(path,errcode) \ do { \ if (strncmp ((path), "/dev/", 5) == 0) \ - IS_DEVICE ((path),(errcode)); \ + RESOLVE_DEVICE ((path), return errcode); \ else { \ NEED_ROOT ((errcode)); \ ABS_PATH ((path),(errcode)); \ diff --git a/daemon/sfdisk.c b/daemon/sfdisk.c index 693e89a1..a504141d 100644 --- a/daemon/sfdisk.c +++ b/daemon/sfdisk.c @@ -53,7 +53,7 @@ sfdisk (char *device, int n, int cyls, int heads, int sectors, if (extra_flag) sprintf (buf + strlen (buf), " %s", extra_flag); - /* Safe because of IS_DEVICE above: */ + /* Safe because of RESOLVE_DEVICE above: */ sprintf (buf + strlen (buf), " %s", device); if (verbose) |