# HG changeset patch # User gqview # Date 1124142080 0 # Node ID 04ff0df3ad2fee6474c46b9d69a8b96f5c230d97 # Parent e29c291e106b3d906f5fb444bd0255d14bfaf83b Mon Aug 15 17:13:57 2005 John Ellis * collect-table.c, dupe.c, exif.c, img-view.c info.c, layout_image.c, md5-util.[ch], pan-view.c, remote.c, search.c, thumb_standard.c, ui_bookmark.c, ui_misc.c, ui_pathsel.c, view_dir_list.c, view_dir_tree.c, view_file_icon.c, view_file_list.c: Fix signedness warnings in gcc 4.0. diff -r e29c291e106b -r 04ff0df3ad2f ChangeLog --- a/ChangeLog Mon Aug 15 20:47:03 2005 +0000 +++ b/ChangeLog Mon Aug 15 21:41:20 2005 +0000 @@ -1,3 +1,11 @@ +Mon Aug 15 17:13:57 2005 John Ellis + + * collect-table.c, dupe.c, exif.c, img-view.c info.c, layout_image.c, + md5-util.[ch], pan-view.c, remote.c, search.c, thumb_standard.c, + ui_bookmark.c, ui_misc.c, ui_pathsel.c, view_dir_list.c, + view_dir_tree.c, view_file_icon.c, view_file_list.c: Fix signedness + warnings in gcc 4.0. + Mon Aug 15 16:35:15 2005 John Ellis * view_dir_tree.c (vdtree_set_path): Do not force reading folder diff -r e29c291e106b -r 04ff0df3ad2f src/collect-table.c --- a/src/collect-table.c Mon Aug 15 20:47:03 2005 +0000 +++ b/src/collect-table.c Mon Aug 15 21:41:20 2005 +0000 @@ -2058,7 +2058,7 @@ } gtk_selection_data_set(selection_data, selection_data->target, - 8, uri_text, total); + 8, (guchar *)uri_text, total); g_free(uri_text); } @@ -2075,7 +2075,7 @@ CollectInfo *drop_info; GList *work; - if (debug) printf(selection_data->data); + if (debug) printf("%s\n", selection_data->data); collection_table_scroll(ct, FALSE); collection_table_insert_marker(ct, NULL, FALSE); @@ -2118,7 +2118,7 @@ } break; case TARGET_URI_LIST: - list = uri_list_from_text(selection_data->data, TRUE); + list = uri_list_from_text((gchar *)selection_data->data, TRUE); work = list; while (work) { diff -r e29c291e106b -r 04ff0df3ad2f src/dupe.c --- a/src/dupe.c Mon Aug 15 20:47:03 2005 +0000 +++ b/src/dupe.c Mon Aug 15 21:41:20 2005 +0000 @@ -3354,7 +3354,7 @@ } if (uri_text) gtk_selection_data_set(selection_data, selection_data->target, - 8, uri_text, length); + 8, (guchar *)uri_text, length); g_free(uri_text); } @@ -3379,7 +3379,7 @@ collection_from_dnd_data((gchar *)selection_data->data, &list, NULL); break; case TARGET_URI_LIST: - list = uri_list_from_text(selection_data->data, TRUE); + list = uri_list_from_text((gchar *)selection_data->data, TRUE); work = list; while(work) { diff -r e29c291e106b -r 04ff0df3ad2f src/exif.c --- a/src/exif.c Mon Aug 15 20:47:03 2005 +0000 +++ b/src/exif.c Mon Aug 15 21:41:20 2005 +0000 @@ -973,10 +973,10 @@ } -static gint exif_parse_JPEG(ExifData *exif, unsigned char *data, guint size, ExifMarker *list) +static gint exif_parse_JPEG(ExifData *exif, unsigned char *data, gint size, ExifMarker *list) { - guint marker; - guint marker_size; + gint marker; + gint marker_size; if (size < 4 || *data != 0xFF || *(data + 1) != MARKER_SOI) { diff -r e29c291e106b -r 04ff0df3ad2f src/img-view.c --- a/src/img-view.c Mon Aug 15 20:47:03 2005 +0000 +++ b/src/img-view.c Mon Aug 15 21:41:20 2005 +0000 @@ -1392,7 +1392,7 @@ { GList *work; - list = uri_list_from_text(selection_data->data, TRUE); + list = uri_list_from_text((gchar *)selection_data->data, TRUE); work = list; while (work) @@ -1481,7 +1481,7 @@ if (text) { gtk_selection_data_set (selection_data, selection_data->target, - 8, text, len); + 8, (guchar *)text, len); g_free(text); } } diff -r e29c291e106b -r 04ff0df3ad2f src/info.c --- a/src/info.c Mon Aug 15 20:47:03 2005 +0000 +++ b/src/info.c Mon Aug 15 21:41:20 2005 +0000 @@ -507,7 +507,7 @@ g_list_free(list); gtk_selection_data_set(selection_data, selection_data->target, - 8, text, len); + 8, (guchar *)text, len); g_free(text); } } diff -r e29c291e106b -r 04ff0df3ad2f src/layout_image.c --- a/src/layout_image.c Mon Aug 15 20:47:03 2005 +0000 +++ b/src/layout_image.c Mon Aug 15 21:41:20 2005 +0000 @@ -816,7 +816,7 @@ if (info == TARGET_URI_LIST) { - list = uri_list_from_text(selection_data->data, TRUE); + list = uri_list_from_text((gchar *)selection_data->data, TRUE); source = NULL; info_list = NULL; } @@ -901,7 +901,7 @@ if (text) { gtk_selection_data_set (selection_data, selection_data->target, - 8, text, len); + 8, (guchar *)text, len); g_free(text); } } diff -r e29c291e106b -r 04ff0df3ad2f src/md5-util.c --- a/src/md5-util.c Mon Aug 15 20:47:03 2005 +0000 +++ b/src/md5-util.c Mon Aug 15 21:41:20 2005 +0000 @@ -315,7 +315,7 @@ * the 16 bytes buffer @digest . **/ void -md5_get_digest (const gchar *buffer, gint buffer_size, guchar digest[16]) +md5_get_digest (const guchar *buffer, gint buffer_size, guchar digest[16]) { MD5Context ctx; diff -r e29c291e106b -r 04ff0df3ad2f src/md5-util.h --- a/src/md5-util.h Mon Aug 15 20:47:03 2005 +0000 +++ b/src/md5-util.h Mon Aug 15 21:41:20 2005 +0000 @@ -42,7 +42,7 @@ void md5_final (MD5Context *ctx, guchar digest[16]); /* generate digest from memory buffer */ -void md5_get_digest (const gchar *buffer, gint buffer_size, guchar digest[16]); +void md5_get_digest (const guchar *buffer, gint buffer_size, guchar digest[16]); /* generate digest from file */ gboolean md5_get_digest_from_file(const gchar *path, guchar digest[16]); diff -r e29c291e106b -r 04ff0df3ad2f src/pan-view.c --- a/src/pan-view.c Mon Aug 15 20:47:03 2005 +0000 +++ b/src/pan-view.c Mon Aug 15 21:41:20 2005 +0000 @@ -4833,7 +4833,7 @@ { GList *list; - list = uri_list_from_text(selection_data->data, TRUE); + list = uri_list_from_text((gchar *)selection_data->data, TRUE); if (list && isdir((gchar *)list->data)) { gchar *path = list->data; @@ -4876,7 +4876,7 @@ if (text) { gtk_selection_data_set (selection_data, selection_data->target, - 8, text, len); + 8, (guchar *)text, len); g_free(text); } } diff -r e29c291e106b -r 04ff0df3ad2f src/remote.c --- a/src/remote.c Mon Aug 15 20:47:03 2005 +0000 +++ b/src/remote.c Mon Aug 15 21:41:20 2005 +0000 @@ -52,7 +52,7 @@ GList *work; gchar *buffer = NULL; GError *error = NULL; - gint termpos; + guint termpos; while (g_io_channel_read_line(source, &buffer, NULL, &termpos, &error) == G_IO_STATUS_NORMAL) { @@ -153,7 +153,7 @@ { RemoteConnection *rc = data; int fd; - int alen; + unsigned int alen; fd = accept(rc->fd, NULL, &alen); if (fd == -1) diff -r e29c291e106b -r 04ff0df3ad2f src/search.c --- a/src/search.c Mon Aug 15 20:47:03 2005 +0000 +++ b/src/search.c Mon Aug 15 21:41:20 2005 +0000 @@ -1371,7 +1371,7 @@ } if (uri_text) gtk_selection_data_set(selection_data, selection_data->target, - 8, uri_text, length); + 8, (guchar *)uri_text, length); g_free(uri_text); } diff -r e29c291e106b -r 04ff0df3ad2f src/thumb_standard.c --- a/src/thumb_standard.c Mon Aug 15 20:47:03 2005 +0000 +++ b/src/thumb_standard.c Mon Aug 15 21:41:20 2005 +0000 @@ -153,7 +153,7 @@ cache_base = g_strconcat(homedir(), "/", THUMB_FOLDER, "/", cache_subfolder, NULL); } - md5_get_digest(uri, strlen(uri), digest); + md5_get_digest((guchar *)uri, strlen(uri), digest); md5_text = md5_digest_to_text(digest); if (cache_base && md5_text) diff -r e29c291e106b -r 04ff0df3ad2f src/ui_bookmark.c --- a/src/ui_bookmark.c Mon Aug 15 20:47:03 2005 +0000 +++ b/src/ui_bookmark.c Mon Aug 15 21:41:20 2005 +0000 @@ -809,7 +809,7 @@ if (!uri_text) return; gtk_selection_data_set(selection_data, selection_data->target, - 8, uri_text, length); + 8, (guchar *)uri_text, length); g_free(uri_text); } @@ -1003,7 +1003,7 @@ { case TARGET_URI_LIST: case TARGET_X_URL: - list = uri_list_from_text(selection_data->data, FALSE); + list = uri_list_from_text((gchar *)selection_data->data, FALSE); break; } diff -r e29c291e106b -r 04ff0df3ad2f src/ui_misc.c --- a/src/ui_misc.c Mon Aug 15 20:47:03 2005 +0000 +++ b/src/ui_misc.c Mon Aug 15 21:41:20 2005 +0000 @@ -899,7 +899,7 @@ static void date_selection_popup_sync(DateSelection *ds) { - gint day, month, year; + guint day, month, year; gtk_calendar_get_date(GTK_CALENDAR(ds->calendar), &year, &month, &day); date_selection_set(ds->box, day, month + 1, year); diff -r e29c291e106b -r 04ff0df3ad2f src/ui_pathsel.c --- a/src/ui_pathsel.c Mon Aug 15 20:47:03 2005 +0000 +++ b/src/ui_pathsel.c Mon Aug 15 21:41:20 2005 +0000 @@ -353,7 +353,7 @@ if (!uri_text) return; gtk_selection_data_set(selection_data, selection_data->target, - 8, uri_text, length); + 8, (guchar *)uri_text, length); g_free(uri_text); } diff -r e29c291e106b -r 04ff0df3ad2f src/view_dir_list.c --- a/src/view_dir_list.c Mon Aug 15 20:47:03 2005 +0000 +++ b/src/view_dir_list.c Mon Aug 15 21:41:20 2005 +0000 @@ -481,7 +481,7 @@ if (text) { gtk_selection_data_set (selection_data, selection_data->target, - 8, text, length); + 8, (guchar *)text, length); g_free(text); } } @@ -537,7 +537,7 @@ GList *list; gint active; - list = uri_list_from_text(selection_data->data, TRUE); + list = uri_list_from_text((gchar *)selection_data->data, TRUE); if (!list) return; active = access_file(fd->path, W_OK | X_OK); diff -r e29c291e106b -r 04ff0df3ad2f src/view_dir_tree.c --- a/src/view_dir_tree.c Mon Aug 15 20:47:03 2005 +0000 +++ b/src/view_dir_tree.c Mon Aug 15 21:41:20 2005 +0000 @@ -559,7 +559,7 @@ if (uri_text) { gtk_selection_data_set(selection_data, selection_data->target, - 8, uri_text, length); + 8, (guchar *)uri_text, length); g_free(uri_text); } } @@ -613,7 +613,7 @@ GList *list; gint active; - list = uri_list_from_text(selection_data->data, TRUE); + list = uri_list_from_text((gchar *)selection_data->data, TRUE); if (!list) return; active = access_file(fd->path, W_OK | X_OK); diff -r e29c291e106b -r 04ff0df3ad2f src/view_file_icon.c --- a/src/view_file_icon.c Mon Aug 15 20:47:03 2005 +0000 +++ b/src/view_file_icon.c Mon Aug 15 21:41:20 2005 +0000 @@ -613,7 +613,7 @@ if (debug) printf(uri_text); gtk_selection_data_set(selection_data, selection_data->target, - 8, uri_text, total); + 8, (guchar *)uri_text, total); g_free(uri_text); } diff -r e29c291e106b -r 04ff0df3ad2f src/view_file_list.c --- a/src/view_file_list.c Mon Aug 15 20:47:03 2005 +0000 +++ b/src/view_file_list.c Mon Aug 15 21:41:20 2005 +0000 @@ -138,7 +138,8 @@ if (debug) printf(uri_text); - gtk_selection_data_set(selection_data, selection_data->target, 8, uri_text, total); + gtk_selection_data_set(selection_data, selection_data->target, + 8, (guchar *)uri_text, total); g_free(uri_text); }