From db82269fde62a3c7cb24549b38f0974988fbdda4 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Tue, 2 Mar 2010 00:18:48 +0000 Subject: Squelch some compiler warnings. svn path=/trunk/; revision=32078 --- fileset.c | 22 +++++++++++----------- fileset.h | 12 ++++++------ 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/fileset.c b/fileset.c index b7cb105bb0..b7a57e27ae 100644 --- a/fileset.c +++ b/fileset.c @@ -62,8 +62,8 @@ typedef struct _fileset { - GList *entries; - const char *dirname; + GList *entries; + char *dirname; } fileset; /* this is the fileset's global data */ @@ -192,7 +192,7 @@ fileset_add_file(const char *dirname, const char *fname, gboolean current) /* Show statistics if they are valid */ if( result == 0 ) { - entry = g_malloc(sizeof(fileset_entry)); + entry = (fileset_entry *)g_malloc(sizeof(fileset_entry)); entry->fullname = g_strdup(path); entry->name = g_strdup(fname); @@ -217,10 +217,10 @@ fileset_add_file(const char *dirname, const char *fname, gboolean current) static gint fileset_sort_compare(gconstpointer a, gconstpointer b) { - const fileset_entry *entry_a = a; - const fileset_entry *entry_b = b; + const fileset_entry *entry_a = (const fileset_entry *)a; + const fileset_entry *entry_b = (const fileset_entry *)b; - return strcmp(entry_a->name, entry_b->name); + return strcmp(entry_a->name, entry_b->name); } @@ -233,7 +233,7 @@ void fileset_update_dlg(void) /* add all entires to the dialog */ le = g_list_first(set.entries); while(le) { - fileset_dlg_add_file(le->data); + fileset_dlg_add_file((fileset_entry *)le->data); le = g_list_next(le); } } @@ -306,7 +306,7 @@ fileset_get_current(void) /* add all entires to the dialog */ le = g_list_first(set.entries); while(le) { - entry = le->data; + entry = (fileset_entry *)le->data; if(entry->current) { return le; } @@ -334,7 +334,7 @@ fileset_get_next(void) return NULL; } - return le->data; + return (fileset_entry *)le->data; } @@ -355,14 +355,14 @@ fileset_get_previous(void) return NULL; } - return le->data; + return (fileset_entry *)le->data; } /* delete a single entry */ static void fileset_entry_delete(gpointer data, gpointer user_data _U_) { - fileset_entry *entry = data; + fileset_entry *entry = (fileset_entry *)data; g_free( (gpointer) entry->fullname); entry->fullname = NULL; diff --git a/fileset.h b/fileset.h index 7c8b14b87f..c6d0dd9294 100644 --- a/fileset.h +++ b/fileset.h @@ -31,12 +31,12 @@ extern "C" { typedef struct _fileset_entry { - const char *fullname; /* File name with path (g_strdup'ed) */ - const char *name; /* File name without path (g_strdup'ed) */ - time_t ctime; /* create time */ - time_t mtime; /* last modified time */ - gint64 size; /* size of file in bytes */ - gboolean current; /* is this the currently loaded file? */ + char *fullname; /* File name with path (g_strdup'ed) */ + char *name; /* File name without path (g_strdup'ed) */ + time_t ctime; /* create time */ + time_t mtime; /* last modified time */ + gint64 size; /* size of file in bytes */ + gboolean current; /* is this the currently loaded file? */ } fileset_entry; -- cgit v1.2.1