X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Faugeas.c;h=b56012cd8af71f4001d7596f1dd15985f7cde0ea;hp=b6cc8f00057154f4349a8f56e5b210681cbc431b;hb=e94f89f40d989d111882178c87b5bfc22314fca8;hpb=6bda071b5cd8393b37653687027c4ae6c6cf3804;ds=sidebyside

diff --git a/daemon/augeas.c b/daemon/augeas.c
index b6cc8f0..b56012c 100644
--- a/daemon/augeas.c
+++ b/daemon/augeas.c
@@ -36,7 +36,6 @@
  * considerably.
  */
 static augeas *aug = NULL;
-#endif
 
 #define NEED_AUG(errcode)						\
   do {									\
@@ -46,17 +45,15 @@ static augeas *aug = NULL;
     }									\
   }									\
   while (0)
+#endif
 
 /* 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;
@@ -379,7 +376,7 @@ do_aug_ls (char *path)
   if (matches == NULL)
     return NULL;		/* do_aug_match has already sent the error */
 
-  sort_strings (matches, count_strings (matches));
+  sort_strings (matches, count_strings ((void *) matches));
   return matches;		/* Caller frees. */
 #else
   reply_with_error ("%s is not available", __func__);