X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=src%2Fguestfs-internal.h;h=9c7c96cc714a38e94f67fb9a75967543e5dc89a8;hb=6283982e36eeb3d19940618dc0aec88da08c7516;hp=e1723a441d6542bab2c90ef2c2518e8060ebd306;hpb=b4618fb060b40ba70f2be28b1b1ad625722a7edf;p=libguestfs.git

diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h
index e1723a4..9c7c96c 100644
--- a/src/guestfs-internal.h
+++ b/src/guestfs-internal.h
@@ -114,6 +114,7 @@ struct guestfs_h
   int selinux;                  /* selinux enabled? */
 
   char *last_error;
+  int last_errnum;              /* errno, or 0 if there was no errno */
 
   /* Callbacks. */
   guestfs_abort_cb           abort_cb;
@@ -168,6 +169,9 @@ enum inspect_os_distro {
   OS_DISTRO_WINDOWS,
   OS_DISTRO_PARDUS,
   OS_DISTRO_ARCHLINUX,
+  OS_DISTRO_GENTOO,
+  OS_DISTRO_UBUNTU,
+  OS_DISTRO_MEEGO,
 };
 
 struct inspect_fs {
@@ -197,6 +201,8 @@ struct guestfs_message_error;
 
 extern void guestfs_error (guestfs_h *g, const char *fs, ...)
   __attribute__((format (printf,2,3)));
+extern void guestfs_error_errno (guestfs_h *g, int errnum, const char *fs, ...)
+  __attribute__((format (printf,3,4)));
 extern void guestfs_perrorf (guestfs_h *g, const char *fs, ...)
   __attribute__((format (printf,2,3)));
 extern void *guestfs_safe_realloc (guestfs_h *g, void *ptr, int nbytes);
@@ -218,8 +224,9 @@ extern int guestfs___accept_from_daemon (guestfs_h *g);
 extern int guestfs___build_appliance (guestfs_h *g, char **kernel, char **initrd, char **appliance);
 extern void guestfs___print_BufferIn (FILE *out, const char *buf, size_t buf_size);
 
-#define error guestfs_error
+#define error(g,...) guestfs_error_errno((g),0,__VA_ARGS__)
 #define perrorf guestfs_perrorf
+#define safe_calloc guestfs_safe_calloc
 #define safe_malloc guestfs_safe_malloc
 #define safe_realloc guestfs_safe_realloc
 #define safe_strdup guestfs_safe_strdup