git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
qemu detection: Free up previous qemu help/version strings if they exist.
[libguestfs.git]
/
src
/
guestfs.c
diff --git
a/src/guestfs.c
b/src/guestfs.c
index
e2b7159
..
002418a
100644
(file)
--- a/
src/guestfs.c
+++ b/
src/guestfs.c
@@
-433,14
+433,8
@@
guestfs_perrorf (guestfs_h *g, const char *fs, ...)
if (err < 0) return;
if (err < 0) return;
-#if !defined(_GNU_SOURCE) || defined(__APPLE__)
char buf[256];
strerror_r (errnum, buf, sizeof buf);
char buf[256];
strerror_r (errnum, buf, sizeof buf);
-#else
- char _buf[256];
- char *buf;
- buf = strerror_r (errnum, _buf, sizeof _buf);
-#endif
msg = safe_realloc (g, msg, strlen (msg) + 2 + strlen (buf) + 1);
strcat (msg, ": ");
msg = safe_realloc (g, msg, strlen (msg) + 2 + strlen (buf) + 1);
strcat (msg, ": ");
@@
-578,6
+572,12
@@
guestfs_get_error_handler (guestfs_h *g, void **data_rtn)
return g->error_cb;
}
return g->error_cb;
}
+void
+guestfs_user_cancel (guestfs_h *g)
+{
+ g->user_cancel = 1;
+}
+
int
guestfs__set_verbose (guestfs_h *g, int v)
{
int
guestfs__set_verbose (guestfs_h *g, int v)
{