summaryrefslogtreecommitdiffstats
path: root/daemon/augeas.c
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2009-08-11 15:59:56 +0200
committerJim Meyering <meyering@redhat.com>2009-08-13 14:45:34 +0200
commit84fc760439e82e6b3616abd0d1f9bd7d7eb01ec0 (patch)
tree5ac525b34b3bf5b3ef336f567c72cd8859b18ab6 /daemon/augeas.c
parent79b5084f70cb67c37dd7cbe60821a78981fd8d59 (diff)
downloadlibguestfs-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/augeas.c')
-rw-r--r--daemon/augeas.c23
1 files changed, 10 insertions, 13 deletions
diff --git a/daemon/augeas.c b/daemon/augeas.c
index b6cc8f00..7de36249 100644
--- a/daemon/augeas.c
+++ b/daemon/augeas.c
@@ -49,14 +49,11 @@ static augeas *aug = NULL;
/* We need to rewrite the root path so it is based at /sysroot. */
int
-do_aug_init (char *root, int flags)
+do_aug_init (const char *root, int flags)
{
#ifdef HAVE_AUGEAS
char *buf;
- NEED_ROOT (return -1);
- ABS_PATH (root, return -1);
-
if (aug) {
aug_close (aug);
aug = NULL;
@@ -100,7 +97,7 @@ do_aug_close (void)
}
int
-do_aug_defvar (char *name, char *expr)
+do_aug_defvar (const char *name, const char *expr)
{
#ifdef HAVE_AUG_DEFVAR
int r;
@@ -120,7 +117,7 @@ do_aug_defvar (char *name, char *expr)
}
guestfs_int_int_bool *
-do_aug_defnode (char *name, char *expr, char *val)
+do_aug_defnode (const char *name, const char *expr, const char *val)
{
#ifdef HAVE_AUG_DEFNODE
static guestfs_int_int_bool r;
@@ -142,7 +139,7 @@ do_aug_defnode (char *name, char *expr, char *val)
}
char *
-do_aug_get (char *path)
+do_aug_get (const char *path)
{
#ifdef HAVE_AUGEAS
const char *value = NULL;
@@ -185,7 +182,7 @@ do_aug_get (char *path)
}
int
-do_aug_set (char *path, char *val)
+do_aug_set (const char *path, const char *val)
{
#ifdef HAVE_AUGEAS
int r;
@@ -206,7 +203,7 @@ do_aug_set (char *path, char *val)
}
int
-do_aug_insert (char *path, char *label, int before)
+do_aug_insert (const char *path, const char *label, int before)
{
#ifdef HAVE_AUGEAS
int r;
@@ -227,7 +224,7 @@ do_aug_insert (char *path, char *label, int before)
}
int
-do_aug_rm (char *path)
+do_aug_rm (const char *path)
{
#ifdef HAVE_AUGEAS
int r;
@@ -248,7 +245,7 @@ do_aug_rm (char *path)
}
int
-do_aug_mv (char *src, char *dest)
+do_aug_mv (const char *src, const char *dest)
{
#ifdef HAVE_AUGEAS
int r;
@@ -269,7 +266,7 @@ do_aug_mv (char *src, char *dest)
}
char **
-do_aug_match (char *path)
+do_aug_match (const char *path)
{
#ifdef HAVE_AUGEAS
char **matches = NULL;
@@ -341,7 +338,7 @@ do_aug_load (void)
/* Simpler version of aug-match, which also sorts the output. */
char **
-do_aug_ls (char *path)
+do_aug_ls (const char *path)
{
#ifdef HAVE_AUGEAS
char **matches;