git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use linker script to control visibility of symbols.
[libguestfs.git]
/
daemon
/
augeas.c
diff --git
a/daemon/augeas.c
b/daemon/augeas.c
index
7de3624
..
de325de
100644
(file)
--- a/
daemon/augeas.c
+++ b/
daemon/augeas.c
@@
-29,6
+29,7
@@
#include "daemon.h"
#include "actions.h"
#include "daemon.h"
#include "actions.h"
+#include "optgroups.h"
#ifdef HAVE_AUGEAS
/* The Augeas handle. We maintain a single handle per daemon, which
#ifdef HAVE_AUGEAS
/* The Augeas handle. We maintain a single handle per daemon, which
@@
-36,7
+37,6
@@
* considerably.
*/
static augeas *aug = NULL;
* considerably.
*/
static augeas *aug = NULL;
-#endif
#define NEED_AUG(errcode) \
do { \
#define NEED_AUG(errcode) \
do { \
@@
-47,6
+47,19
@@
static augeas *aug = NULL;
} \
while (0)
} \
while (0)
+int
+optgroup_augeas_available (void)
+{
+ return 1;
+}
+#else /* !HAVE_AUGEAS */
+int
+optgroup_augeas_available (void)
+{
+ return 0;
+}
+#endif
+
/* We need to rewrite the root path so it is based at /sysroot. */
int
do_aug_init (const char *root, int flags)
/* We need to rewrite the root path so it is based at /sysroot. */
int
do_aug_init (const char *root, int flags)
@@
-75,8
+88,7
@@
do_aug_init (const char *root, int flags)
return 0;
#else
return 0;
#else
- reply_with_error ("%s is not available", __func__);
- return -1;
+ NOT_AVAILABLE (-1);
#endif
}
#endif
}
@@
-91,8
+103,7
@@
do_aug_close (void)
return 0;
#else
return 0;
#else
- reply_with_error ("%s is not available", __func__);
- return -1;
+ NOT_AVAILABLE (-1);
#endif
}
#endif
}
@@
-111,8
+122,7
@@
do_aug_defvar (const char *name, const char *expr)
}
return r;
#else
}
return r;
#else
- reply_with_error ("%s is not available", __func__);
- return -1;
+ NOT_AVAILABLE (-1);
#endif
}
#endif
}
@@
-133,8
+143,7
@@
do_aug_defnode (const char *name, const char *expr, const char *val)
r.b = created;
return &r;
#else
r.b = created;
return &r;
#else
- reply_with_error ("%s is not available", __func__);
- return NULL;
+ NOT_AVAILABLE (NULL);
#endif
}
#endif
}
@@
-176,8
+185,7
@@
do_aug_get (const char *path)
return v; /* Caller frees. */
#else
return v; /* Caller frees. */
#else
- reply_with_error ("%s is not available", __func__);
- return NULL;
+ NOT_AVAILABLE (NULL);
#endif
}
#endif
}
@@
-197,8
+205,7
@@
do_aug_set (const char *path, const char *val)
return 0;
#else
return 0;
#else
- reply_with_error ("%s is not available", __func__);
- return -1;
+ NOT_AVAILABLE (-1);
#endif
}
#endif
}
@@
-218,8
+225,7
@@
do_aug_insert (const char *path, const char *label, int before)
return 0;
#else
return 0;
#else
- reply_with_error ("%s is not available", __func__);
- return -1;
+ NOT_AVAILABLE (-1);
#endif
}
#endif
}
@@
-239,8
+245,7
@@
do_aug_rm (const char *path)
return r;
#else
return r;
#else
- reply_with_error ("%s is not available", __func__);
- return -1;
+ NOT_AVAILABLE (-1);
#endif
}
#endif
}
@@
-260,8
+265,7
@@
do_aug_mv (const char *src, const char *dest)
return 0;
#else
return 0;
#else
- reply_with_error ("%s is not available", __func__);
- return -1;
+ NOT_AVAILABLE (-1);
#endif
}
#endif
}
@@
-295,8
+299,7
@@
do_aug_match (const char *path)
return matches; /* Caller frees. */
#else
return matches; /* Caller frees. */
#else
- reply_with_error ("%s is not available", __func__);
- return NULL;
+ NOT_AVAILABLE (NULL);
#endif
}
#endif
}
@@
-313,8
+316,7
@@
do_aug_save (void)
return 0;
#else
return 0;
#else
- reply_with_error ("%s is not available", __func__);
- return -1;
+ NOT_AVAILABLE (-1);
#endif
}
#endif
}
@@
-331,8
+333,7
@@
do_aug_load (void)
return 0;
#else
return 0;
#else
- reply_with_error ("%s is not available", __func__);
- return -1;
+ NOT_AVAILABLE (-1);
#endif
}
#endif
}
@@
-376,10
+377,9
@@
do_aug_ls (const char *path)
if (matches == NULL)
return NULL; /* do_aug_match has already sent the error */
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
return matches; /* Caller frees. */
#else
- reply_with_error ("%s is not available", __func__);
- return NULL;
+ NOT_AVAILABLE (NULL);
#endif
}
#endif
}