git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
generator: trace mode prints return values.
[libguestfs.git]
/
examples
/
to-xml.c
diff --git
a/examples/to-xml.c
b/examples/to-xml.c
index
f48d1ca
..
45994cb
100644
(file)
--- a/
examples/to-xml.c
+++ b/
examples/to-xml.c
@@
-25,7
+25,7
@@
* to stderr already.
*/
#define CALL(call,errcode) \
* to stderr already.
*/
#define CALL(call,errcode) \
- if ((call) == (errcode)) exit (
1
);
+ if ((call) == (errcode)) exit (
EXIT_FAILURE
);
static void display_partition (guestfs_h *g, const char *dev);
static void display_partitions (guestfs_h *g, const char *dev);
static void display_partition (guestfs_h *g, const char *dev);
static void display_partitions (guestfs_h *g, const char *dev);
@@
-39,16
+39,18
@@
main (int argc, char *argv[])
if (argc < 2 || access (argv[1], F_OK) != 0) {
fprintf (stderr, "Usage: to-xml guest.img [guest.img ...]\n");
if (argc < 2 || access (argv[1], F_OK) != 0) {
fprintf (stderr, "Usage: to-xml guest.img [guest.img ...]\n");
- exit (
1
);
+ exit (
EXIT_FAILURE
);
}
if (!(g = guestfs_create ())) {
fprintf (stderr, "Cannot create libguestfs handle.\n");
}
if (!(g = guestfs_create ())) {
fprintf (stderr, "Cannot create libguestfs handle.\n");
- exit (
1
);
+ exit (
EXIT_FAILURE
);
}
for (i = 1; i < argc; ++i)
}
for (i = 1; i < argc; ++i)
- CALL (guestfs_add_drive (g, argv[i]), -1);
+ CALL (guestfs_add_drive_opts (g, argv[i],
+ GUESTFS_ADD_DRIVE_OPTS_FORMAT, "raw",
+ -1), -1);
CALL (guestfs_launch (g), -1);
CALL (guestfs_launch (g), -1);
@@
-149,7
+151,7
@@
display_partitions (guestfs_h *g, const char *dev)
* That's a limitation of sorts of the Linux kernel. (Actually,
* we could do this if we add the kpartx program to libguestfs).
*/
* That's a limitation of sorts of the Linux kernel. (Actually,
* we could do this if we add the kpartx program to libguestfs).
*/
- if (
STRNEQLEN (dev, "/dev/sd", 7)
|| isdigit (dev[strlen(dev)-1])) {
+ if (
strncmp (dev, "/dev/sd", 7) != 0
|| isdigit (dev[strlen(dev)-1])) {
printf ("<vm-image dev=\"%s\"/>\n", dev);
return;
}
printf ("<vm-image dev=\"%s\"/>\n", dev);
return;
}