diff options
| author | Richard Jones <rjones@redhat.com> | 2010-09-01 13:19:05 +0100 |
|---|---|---|
| committer | Richard Jones <rjones@redhat.com> | 2010-09-01 14:20:22 +0100 |
| commit | 867319ec5f9030d3c14c32e3302606f2bf11ac27 (patch) | |
| tree | e865b119d6fb453a61b913941368b1405b6b1f2a /src/guestfs.h | |
| parent | c9bc865a7acf372a66f7c9a3f34440deb32f1ea9 (diff) | |
| download | libguestfs-867319ec5f9030d3c14c32e3302606f2bf11ac27.tar.gz libguestfs-867319ec5f9030d3c14c32e3302606f2bf11ac27.tar.xz libguestfs-867319ec5f9030d3c14c32e3302606f2bf11ac27.zip | |
Consistent use of 'void *opaque' to refer to opaque pointer in C API.
We inconsistently used 'void *data' or 'void *opaque' all over to
refer to the same thing. Use 'void *opaque' in all places in the
published API and documentation.
Diffstat (limited to 'src/guestfs.h')
| -rw-r--r-- | src/guestfs.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/guestfs.h b/src/guestfs.h index 0bfad4f9..9fc6ca5b 100644 --- a/src/guestfs.h +++ b/src/guestfs.h @@ -45,21 +45,21 @@ extern void guestfs_close (guestfs_h *g); /*--- Error handling ---*/ extern const char *guestfs_last_error (guestfs_h *g); -typedef void (*guestfs_error_handler_cb) (guestfs_h *g, void *data, const char *msg); +typedef void (*guestfs_error_handler_cb) (guestfs_h *g, void *opaque, const char *msg); typedef void (*guestfs_abort_cb) (void) __attribute__((__noreturn__)); -extern void guestfs_set_error_handler (guestfs_h *g, guestfs_error_handler_cb cb, void *data); -extern guestfs_error_handler_cb guestfs_get_error_handler (guestfs_h *g, void **data_rtn); +extern void guestfs_set_error_handler (guestfs_h *g, guestfs_error_handler_cb cb, void *opaque); +extern guestfs_error_handler_cb guestfs_get_error_handler (guestfs_h *g, void **opaque_rtn); extern void guestfs_set_out_of_memory_handler (guestfs_h *g, guestfs_abort_cb); extern guestfs_abort_cb guestfs_get_out_of_memory_handler (guestfs_h *g); /*--- Events ---*/ -typedef void (*guestfs_log_message_cb) (guestfs_h *g, void *data, char *buf, int len); -typedef void (*guestfs_subprocess_quit_cb) (guestfs_h *g, void *data); -typedef void (*guestfs_launch_done_cb) (guestfs_h *g, void *data); -typedef void (*guestfs_close_cb) (guestfs_h *g, void *data); -typedef void (*guestfs_progress_cb) (guestfs_h *g, void *data, int proc_nr, int serial, uint64_t position, uint64_t total); +typedef void (*guestfs_log_message_cb) (guestfs_h *g, void *opaque, char *buf, int len); +typedef void (*guestfs_subprocess_quit_cb) (guestfs_h *g, void *opaque); +typedef void (*guestfs_launch_done_cb) (guestfs_h *g, void *opaque); +typedef void (*guestfs_close_cb) (guestfs_h *g, void *opaque); +typedef void (*guestfs_progress_cb) (guestfs_h *g, void *opaque, int proc_nr, int serial, uint64_t position, uint64_t total); extern void guestfs_set_log_message_callback (guestfs_h *g, guestfs_log_message_cb cb, void *opaque); extern void guestfs_set_subprocess_quit_callback (guestfs_h *g, guestfs_subprocess_quit_cb cb, void *opaque); |