X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=src%2Fguestfs.h;h=f2e108b5f366ec283fa0466b4d03c8af037e293f;hp=823fefe8601763d677b123ed5fe49968d2bd2d22;hb=2f1a50d81671810256dce0852e6b1e0810ac44af;hpb=170f262f0413de843af62b968f6d12c1c476ae7f

diff --git a/src/guestfs.h b/src/guestfs.h
index 823fefe..f2e108b 100644
--- a/src/guestfs.h
+++ b/src/guestfs.h
@@ -1,5 +1,5 @@
 /* libguestfs
- * Copyright (C) 2009 Red Hat Inc. 
+ * Copyright (C) 2009 Red Hat Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -26,6 +26,10 @@
 
 #include <rpc/xdr.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct guestfs_h guestfs_h;
 typedef struct guestfs_main_loop guestfs_main_loop;
 
@@ -48,12 +52,6 @@ extern guestfs_abort_cb guestfs_get_out_of_memory_handler (guestfs_h *g);
 #include <guestfs-structs.h>
 #include <guestfs-actions.h>
 
-/* Free up return values. */
-extern void guestfs_free_int_bool (struct guestfs_int_bool *);
-extern void guestfs_free_lvm_pv_list (struct guestfs_lvm_pv_list *);
-extern void guestfs_free_lvm_vg_list (struct guestfs_lvm_vg_list *);
-extern void guestfs_free_lvm_lv_list (struct guestfs_lvm_lv_list *);
-
 /* Low-level event API. */
 typedef void (*guestfs_send_cb) (guestfs_h *g, void *data);
 typedef void (*guestfs_reply_cb) (guestfs_h *g, void *data, XDR *xdr);
@@ -72,6 +70,7 @@ extern void guestfs_error (guestfs_h *g, const char *fs, ...)
 extern void guestfs_perrorf (guestfs_h *g, const char *fs, ...)
   __attribute__((format (printf,2,3)));
 extern void *guestfs_safe_malloc (guestfs_h *g, size_t nbytes);
+extern void *guestfs_safe_calloc (guestfs_h *g, size_t n, size_t s);
 extern void *guestfs_safe_realloc (guestfs_h *g, void *ptr, int nbytes);
 extern char *guestfs_safe_strdup (guestfs_h *g, const char *str);
 extern void *guestfs_safe_memdup (guestfs_h *g, void *ptr, size_t size);
@@ -120,4 +119,8 @@ extern guestfs_main_loop *guestfs_get_default_main_loop (void);
 extern guestfs_main_loop *guestfs_create_main_loop (void);
 extern void guestfs_free_main_loop (guestfs_main_loop *);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* GUESTFS_H_ */