diff options
| author | Richard Jones <rjones@redhat.com> | 2010-09-01 13:19:05 +0100 |
|---|---|---|
| committer | Richard Jones <rjones@redhat.com> | 2010-09-08 14:24:46 +0100 |
| commit | 32d357bb907441e2a446a4e359a698a5c9d6c916 (patch) | |
| tree | e354ccdff7057c4fb0446fe59e2d5a00046f07b9 | |
| parent | 72905b32d26c981bebfd641d6fe00c4078e388af (diff) | |
| download | libguestfs-32d357bb907441e2a446a4e359a698a5c9d6c916.tar.gz libguestfs-32d357bb907441e2a446a4e359a698a5c9d6c916.tar.xz libguestfs-32d357bb907441e2a446a4e359a698a5c9d6c916.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.
Cherry picked from commit 867319ec5f9030d3c14c32e3302606f2bf11ac27.
| -rw-r--r-- | src/guestfs.h | 14 | ||||
| -rw-r--r-- | src/guestfs.pod | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/guestfs.h b/src/guestfs.h index 3cff4849..a33ff4ba 100644 --- a/src/guestfs.h +++ b/src/guestfs.h @@ -43,20 +43,20 @@ 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_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); 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); diff --git a/src/guestfs.pod b/src/guestfs.pod index e8760168..30243480 100644 --- a/src/guestfs.pod +++ b/src/guestfs.pod @@ -739,11 +739,11 @@ largest number of results. =head2 guestfs_set_error_handler typedef void (*guestfs_error_handler_cb) (guestfs_h *g, - void *data, + void *opaque, const char *msg); void guestfs_set_error_handler (guestfs_h *g, guestfs_error_handler_cb cb, - void *data); + void *opaque); The callback C<cb> will be called if there is an error. The parameters passed to the callback are an opaque data pointer and the @@ -760,7 +760,7 @@ If you set C<cb> to C<NULL> then I<no> handler is called. =head2 guestfs_get_error_handler guestfs_error_handler_cb guestfs_get_error_handler (guestfs_h *g, - void **data_rtn); + void **opaque_rtn); Returns the current error handler callback. |