From 3ec7e5728fa2a17086d3b3144b46318e7a1f761d Mon Sep 17 00:00:00 2001 From: Laurent Monin Date: Tue, 26 Aug 2008 22:37:18 +0000 Subject: [PATCH] Use gpointer instead of void *. --- src/collect-dlg.c | 2 +- src/exif-int.h | 2 +- src/exif.c | 8 ++++---- src/filedata.c | 4 ++-- src/filedata.h | 2 +- src/format_raw.c | 6 +++--- src/pan-view.c | 2 +- src/secure_save.c | 2 +- src/secure_save.h | 2 +- src/similar.c | 6 +++--- src/ui_pathsel.c | 2 +- src/ui_utildlg.c | 4 ++-- src/view_file_icon.c | 2 +- 13 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/collect-dlg.c b/src/collect-dlg.c index 363bdf3d..8f457172 100644 --- a/src/collect-dlg.c +++ b/src/collect-dlg.c @@ -161,7 +161,7 @@ static void collection_save_or_load_dialog(const gchar *path, CollectWindow *cw; const gchar *title; const gchar *btntext; - void *btnfunc; + gpointer btnfunc; gchar *base; const gchar *stock_id; diff --git a/src/exif-int.h b/src/exif-int.h index dcccaea3..1bd04e3e 100644 --- a/src/exif-int.h +++ b/src/exif-int.h @@ -150,7 +150,7 @@ void exif_byte_put_int32(guchar *f, guint32 n, ExifByteOrder bo); ExifItem *exif_item_new(ExifFormatType format, guint tag, guint elements, const ExifMarker *marker); -void exif_item_copy_data(ExifItem *item, void *src, guint len, +void exif_item_copy_data(ExifItem *item, gpointer src, guint len, ExifFormatType src_format, ExifByteOrder bo); gint exif_parse_IFD_table(ExifData *exif, diff --git a/src/exif.c b/src/exif.c index 7299461d..ecc8a729 100644 --- a/src/exif.c +++ b/src/exif.c @@ -713,7 +713,7 @@ static const ExifMarker *exif_marker_from_tag(guint16 tag, const ExifMarker *lis return (list[i].tag == 0 ? NULL : &list[i]); } -static void rational_from_data(ExifRational *r, void *src, ExifByteOrder bo) +static void rational_from_data(ExifRational *r, gpointer src, ExifByteOrder bo) { r->num = exif_byte_get_int32(src, bo); r->den = exif_byte_get_int32(src + sizeof(guint32), bo); @@ -722,7 +722,7 @@ static void rational_from_data(ExifRational *r, void *src, ExifByteOrder bo) /* src_format and item->format must be compatible * and not overrun src or item->data. */ -void exif_item_copy_data(ExifItem *item, void *src, guint len, +void exif_item_copy_data(ExifItem *item, gpointer src, guint len, ExifFormatType src_format, ExifByteOrder bo) { gint bs; @@ -1132,7 +1132,7 @@ static gint map_file(const gchar *path, void **mapping, gint *size) return 0; } -static gint unmap_file(void *mapping, gint size) +static gint unmap_file(gpointer mapping, gint size) { if (munmap(mapping, size) == -1) { @@ -1164,7 +1164,7 @@ void exif_free(ExifData *exif) ExifData *exif_read(gchar *path, gchar *sidecar_path) { ExifData *exif; - void *f; + gpointer f; gint size, res; gchar *pathl; diff --git a/src/filedata.c b/src/filedata.c index d71eca9b..f9c75f37 100644 --- a/src/filedata.c +++ b/src/filedata.c @@ -752,7 +752,7 @@ gint filelist_sort_compare_filedata_full(FileData *fa, FileData *fb, SortType me return filelist_sort_compare_filedata(fa, fb); } -static gint filelist_sort_file_cb(void *a, void *b) +static gint filelist_sort_file_cb(gpointer a, gpointer b) { return filelist_sort_compare_filedata(a, b); } @@ -764,7 +764,7 @@ GList *filelist_sort_full(GList *list, SortType method, gint ascend, GCompareFun return g_list_sort(list, cb); } -GList *filelist_insert_sort_full(GList *list, void *data, SortType method, gint ascend, GCompareFunc cb) +GList *filelist_insert_sort_full(GList *list, gpointer data, SortType method, gint ascend, GCompareFunc cb) { filelist_sort_method = method; filelist_sort_ascend = ascend; diff --git a/src/filedata.h b/src/filedata.h index 81920585..91bbbcb3 100644 --- a/src/filedata.h +++ b/src/filedata.h @@ -49,7 +49,7 @@ gint filelist_sort_compare_filedata_full(FileData *fa, FileData *fb, SortType me GList *filelist_sort(GList *list, SortType method, gint ascend); GList *filelist_insert_sort(GList *list, FileData *fd, SortType method, gint ascend); GList *filelist_sort_full(GList *list, SortType method, gint ascend, GCompareFunc cb); -GList *filelist_insert_sort_full(GList *list, void *data, SortType method, gint ascend, GCompareFunc cb); +GList *filelist_insert_sort_full(GList *list, gpointer data, SortType method, gint ascend, GCompareFunc cb); gint filelist_read(FileData *dir_fd, GList **files, GList **dirs); gint filelist_read_lstat(FileData *dir_fd, GList **files, GList **dirs); diff --git a/src/format_raw.c b/src/format_raw.c index aaa75c61..1f20ce85 100644 --- a/src/format_raw.c +++ b/src/format_raw.c @@ -42,7 +42,7 @@ struct _FormatRawEntry { const gchar *extension; FormatRawMatchType magic_type; const guint magic_offset; - const void *magic_pattern; + const gpointer magic_pattern; const guint magic_length; const FormatRawExifType exif_type; FormatRawExifParseFunc exif_func; @@ -67,7 +67,7 @@ static FormatRawEntry format_raw_list[] = { typedef struct _FormatExifEntry FormatExifEntry; struct _FormatExifEntry { FormatExifMatchType header_type; - const void *header_pattern; + const gpointer header_pattern; const guint header_length; const gchar *description; FormatExifParseFunc func_parse; @@ -299,7 +299,7 @@ gint format_raw_img_exif_offsets_fd(gint fd, const gchar *path, guint *image_offset, guint *exif_offset) { FormatRawEntry *entry; - void *map_data = NULL; + gpointer map_data = NULL; size_t map_len = 0; struct stat st; gint success; diff --git a/src/pan-view.c b/src/pan-view.c index e988e40c..f9022b03 100644 --- a/src/pan-view.c +++ b/src/pan-view.c @@ -523,7 +523,7 @@ static void pan_window_zoom_limit(PanWindow *pw) *----------------------------------------------------------------------------- */ -static gint pan_cache_sort_file_cb(void *a, void *b) +static gint pan_cache_sort_file_cb(gpointer a, gpointer b) { PanCacheData *pca = a; PanCacheData *pcb = b; diff --git a/src/secure_save.c b/src/secure_save.c index 253b44bb..712529f8 100644 --- a/src/secure_save.c +++ b/src/secure_save.c @@ -373,7 +373,7 @@ secure_fprintf(SecureSaveInfo *ssi, const gchar *format, ...) * the number of elements to write. If ssi->err is set when called, it immediatly returns 0. */ size_t -secure_fwrite(const void *ptr, size_t size, size_t nmemb, SecureSaveInfo *ssi) +secure_fwrite(const gpointer ptr, size_t size, size_t nmemb, SecureSaveInfo *ssi) { size_t ret; diff --git a/src/secure_save.h b/src/secure_save.h index 2ac953e3..dc6f0519 100644 --- a/src/secure_save.h +++ b/src/secure_save.h @@ -22,7 +22,7 @@ gint secure_fputs(SecureSaveInfo *, const gchar *); gint secure_fputc(SecureSaveInfo *, gint); gint secure_fprintf(SecureSaveInfo *, const gchar *, ...); -size_t secure_fwrite(const void *ptr, size_t size, size_t nmemb, SecureSaveInfo *ssi); +size_t secure_fwrite(const gpointer ptr, size_t size, size_t nmemb, SecureSaveInfo *ssi); gchar *secsave_strerror(SecureSaveErrno); diff --git a/src/similar.c b/src/similar.c index 0ee308db..7f5c755a 100644 --- a/src/similar.c +++ b/src/similar.c @@ -68,10 +68,10 @@ void image_sim_free(ImageSimilarityData *sd) g_free(sd); } -static gint image_sim_channel_eq_sort_cb(const void *a, const void *b) +static gint image_sim_channel_eq_sort_cb(const gpointer a, const gpointer b) { - gint *pa = (void *)a; - gint *pb = (void *)b; + gint *pa = (gpointer)a; + gint *pb = (gpointer)b; if (pa[1] < pb[1]) return -1; if (pa[1] > pb[1]) return 1; return 0; diff --git a/src/ui_pathsel.c b/src/ui_pathsel.c index f9e8b201..587a4a5f 100644 --- a/src/ui_pathsel.c +++ b/src/ui_pathsel.c @@ -145,7 +145,7 @@ static gint dest_check_filter(const gchar *filter, const gchar *file) #define CASE_SORT strcmp #endif -static gint dest_sort_cb(void *a, void *b) +static gint dest_sort_cb(gpointer a, gpointer b) { return CASE_SORT((gchar *)a, (gchar *)b); } diff --git a/src/ui_utildlg.c b/src/ui_utildlg.c index f63507e9..8361512f 100644 --- a/src/ui_utildlg.c +++ b/src/ui_utildlg.c @@ -344,7 +344,7 @@ FileDialog *file_dialog_new(const gchar *title, generic_dialog_setup(GENERIC_DIALOG(fdlg), title, wmclass, wmsubclass, parent, FALSE, - (void *)cancel_cb, data); + (gpointer)cancel_cb, data); return fdlg; } @@ -353,7 +353,7 @@ GtkWidget *file_dialog_add_button(FileDialog *fdlg, const gchar *stock_id, const void (*func_cb)(FileDialog *, gpointer), gint is_default) { return generic_dialog_add_button(GENERIC_DIALOG(fdlg), stock_id, text, - (void *)func_cb, is_default); + (gpointer)func_cb, is_default); } static void file_dialog_entry_cb(GtkWidget *widget, gpointer data) diff --git a/src/view_file_icon.c b/src/view_file_icon.c index 284f1617..5b4c91ca 100644 --- a/src/view_file_icon.c +++ b/src/view_file_icon.c @@ -131,7 +131,7 @@ static void iconlist_free(GList *list) } -gint iconlist_sort_file_cb(void *a, void *b) +gint iconlist_sort_file_cb(gpointer a, gpointer b) { IconData *ida = a; IconData *idb = b; -- 2.20.1