Skip to content

Commit

Permalink
Use gboolean where applicable, for the sake of consistency.
Browse files Browse the repository at this point in the history
  • Loading branch information
Laurent Monin committed Mar 12, 2009
1 parent 2814d20 commit 445675d
Show file tree
Hide file tree
Showing 17 changed files with 160 additions and 164 deletions.
2 changes: 1 addition & 1 deletion src/cache-loader.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ struct _CacheLoader {
CacheLoaderDoneFunc done_func;
gpointer done_data;

gint error;
gboolean error;

ImageLoader *il;
gint idle_id;
Expand Down
34 changes: 17 additions & 17 deletions src/cache.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ void cache_sim_data_free(CacheData *cd)
*-------------------------------------------------------------------
*/

static gint cache_sim_write_dimensions(SecureSaveInfo *ssi, CacheData *cd)
static gboolean cache_sim_write_dimensions(SecureSaveInfo *ssi, CacheData *cd)
{
if (!cd || !cd->dimensions) return FALSE;

Expand All @@ -83,7 +83,7 @@ static gint cache_sim_write_dimensions(SecureSaveInfo *ssi, CacheData *cd)
return TRUE;
}

static gint cache_sim_write_date(SecureSaveInfo *ssi, CacheData *cd)
static gboolean cache_sim_write_date(SecureSaveInfo *ssi, CacheData *cd)
{
if (!cd || !cd->have_date) return FALSE;

Expand All @@ -92,7 +92,7 @@ static gint cache_sim_write_date(SecureSaveInfo *ssi, CacheData *cd)
return TRUE;
}

static gint cache_sim_write_checksum(SecureSaveInfo *ssi, CacheData *cd)
static gboolean cache_sim_write_checksum(SecureSaveInfo *ssi, CacheData *cd)
{
if (!cd || !cd->have_checksum) return FALSE;

Expand All @@ -101,7 +101,7 @@ static gint cache_sim_write_checksum(SecureSaveInfo *ssi, CacheData *cd)
return TRUE;
}

static gint cache_sim_write_md5sum(SecureSaveInfo *ssi, CacheData *cd)
static gboolean cache_sim_write_md5sum(SecureSaveInfo *ssi, CacheData *cd)
{
gchar *text;

Expand All @@ -114,7 +114,7 @@ static gint cache_sim_write_md5sum(SecureSaveInfo *ssi, CacheData *cd)
return TRUE;
}

static gint cache_sim_write_similarity(SecureSaveInfo *ssi, CacheData *cd)
static gboolean cache_sim_write_similarity(SecureSaveInfo *ssi, CacheData *cd)
{
guint x, y;
guint8 buf[3 * 32];
Expand Down Expand Up @@ -145,7 +145,7 @@ static gint cache_sim_write_similarity(SecureSaveInfo *ssi, CacheData *cd)
return TRUE;
}

gint cache_sim_data_save(CacheData *cd)
gboolean cache_sim_data_save(CacheData *cd)
{
SecureSaveInfo *ssi;
gchar *pathl;
Expand Down Expand Up @@ -185,7 +185,7 @@ gint cache_sim_data_save(CacheData *cd)
*-------------------------------------------------------------------
*/

static gint cache_sim_read_skipline(FILE *f, gint s)
static gboolean cache_sim_read_skipline(FILE *f, gint s)
{
if (!f) return FALSE;

Expand All @@ -202,7 +202,7 @@ static gint cache_sim_read_skipline(FILE *f, gint s)
return FALSE;
}

static gint cache_sim_read_comment(FILE *f, gchar *buf, gint s, CacheData *cd)
static gboolean cache_sim_read_comment(FILE *f, gchar *buf, gint s, CacheData *cd)
{
if (!f || !buf || !cd) return FALSE;

Expand All @@ -211,7 +211,7 @@ static gint cache_sim_read_comment(FILE *f, gchar *buf, gint s, CacheData *cd)
return cache_sim_read_skipline(f, s - 1);
}

static gint cache_sim_read_dimensions(FILE *f, gchar *buf, gint s, CacheData *cd)
static gboolean cache_sim_read_dimensions(FILE *f, gchar *buf, gint s, CacheData *cd)
{
if (!f || !buf || !cd) return FALSE;

Expand Down Expand Up @@ -254,7 +254,7 @@ static gint cache_sim_read_dimensions(FILE *f, gchar *buf, gint s, CacheData *cd
return FALSE;
}

static gint cache_sim_read_date(FILE *f, gchar *buf, gint s, CacheData *cd)
static gboolean cache_sim_read_date(FILE *f, gchar *buf, gint s, CacheData *cd)
{
if (!f || !buf || !cd) return FALSE;

Expand Down Expand Up @@ -294,7 +294,7 @@ static gint cache_sim_read_date(FILE *f, gchar *buf, gint s, CacheData *cd)
return FALSE;
}

static gint cache_sim_read_checksum(FILE *f, gchar *buf, gint s, CacheData *cd)
static gboolean cache_sim_read_checksum(FILE *f, gchar *buf, gint s, CacheData *cd)
{
if (!f || !buf || !cd) return FALSE;

Expand Down Expand Up @@ -334,7 +334,7 @@ static gint cache_sim_read_checksum(FILE *f, gchar *buf, gint s, CacheData *cd)
return FALSE;
}

static gint cache_sim_read_md5sum(FILE *f, gchar *buf, gint s, CacheData *cd)
static gboolean cache_sim_read_md5sum(FILE *f, gchar *buf, gint s, CacheData *cd)
{
if (!f || !buf || !cd) return FALSE;

Expand Down Expand Up @@ -371,7 +371,7 @@ static gint cache_sim_read_md5sum(FILE *f, gchar *buf, gint s, CacheData *cd)
return FALSE;
}

static gint cache_sim_read_similarity(FILE *f, gchar *buf, gint s, CacheData *cd)
static gboolean cache_sim_read_similarity(FILE *f, gchar *buf, gint s, CacheData *cd)
{
if (!f || !buf || !cd) return FALSE;

Expand Down Expand Up @@ -570,7 +570,7 @@ void cache_sim_data_set_similarity(CacheData *cd, ImageSimilarityData *sd)
cd->similarity = TRUE;
}

gint cache_sim_data_filled(ImageSimilarityData *sd)
gboolean cache_sim_data_filled(ImageSimilarityData *sd)
{
if (!sd) return FALSE;
return sd->filled;
Expand Down Expand Up @@ -678,7 +678,7 @@ gchar *cache_find_location(CacheType type, const gchar *source)
const gchar *cache_rc;
const gchar *cache_local;
const gchar *cache_ext;
gint prefer_local;
gboolean prefer_local;

if (!source) return NULL;

Expand Down Expand Up @@ -726,13 +726,13 @@ gchar *cache_find_location(CacheType type, const gchar *source)
return path;
}

gint cache_time_valid(const gchar *cache, const gchar *path)
gboolean cache_time_valid(const gchar *cache, const gchar *path)
{
struct stat cache_st;
struct stat path_st;
gchar *cachel;
gchar *pathl;
gint ret = FALSE;
gboolean ret = FALSE;

if (!cache || !path) return FALSE;

Expand Down
14 changes: 7 additions & 7 deletions src/cache.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,20 +48,20 @@ struct _CacheData
guchar md5sum[16];
ImageSimilarityData *sim;

gint dimensions;
gint have_date;
gint have_checksum;
gint have_md5sum;
gint similarity;
gboolean dimensions;
gboolean have_date;
gboolean have_checksum;
gboolean have_md5sum;
gboolean similarity;
};

gint cache_time_valid(const gchar *cache, const gchar *path);
gboolean cache_time_valid(const gchar *cache, const gchar *path);


CacheData *cache_sim_data_new(void);
void cache_sim_data_free(CacheData *cd);

gint cache_sim_data_save(CacheData *cd);
gboolean cache_sim_data_save(CacheData *cd);
CacheData *cache_sim_data_load(const gchar *path);

void cache_sim_data_set_dimensions(CacheData *cd, gint w, gint h);
Expand Down
24 changes: 12 additions & 12 deletions src/cache_maint.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ struct _CMData
GtkWidget *spinner;
GtkWidget *button_stop;
GtkWidget *button_close;
gint clear;
gint metadata;
gboolean clear;
gboolean metadata;
};

#define PURGE_DIALOG_WIDTH 400
Expand Down Expand Up @@ -83,7 +83,7 @@ static gchar *extension_find_dot(gchar *path)
return dot;
}

static gint isempty(const gchar *path)
static gboolean isempty(const gchar *path)
{
DIR *dp;
struct dirent *dir;
Expand Down Expand Up @@ -133,7 +133,7 @@ static void cache_maintain_home_stop(CMData *cm)
gtk_widget_set_sensitive(cm->button_close, TRUE);
}

static gint cache_maintain_home_cb(gpointer data)
static gboolean cache_maintain_home_cb(gpointer data)
{
CMData *cm = data;
GList *dlist = NULL;
Expand Down Expand Up @@ -269,7 +269,7 @@ static void cache_maintain_home_stop_cb(GenericDialog *gd, gpointer data)
}

/* sorry for complexity (cm->done_list), but need it to remove empty dirs */
void cache_maintain_home(gint metadata, gint clear, GtkWidget *parent)
void cache_maintain_home(gboolean metadata, gboolean clear, GtkWidget *parent)
{
CMData *cm;
GList *dlist;
Expand Down Expand Up @@ -671,7 +671,7 @@ struct _CleanData
GList *list_dir;

gint days;
gint clear;
gboolean clear;

GtkWidget *button_close;
GtkWidget *button_stop;
Expand All @@ -685,8 +685,8 @@ struct _CleanData
gint count_total;
gint count_done;

gint local;
gint recurse;
gboolean local;
gboolean recurse;

gint idle_id;
};
Expand Down Expand Up @@ -755,7 +755,7 @@ static void cache_manager_render_folder(CleanData *cd, FileData *dir_fd)
cd->list_dir = g_list_concat(list_d, cd->list_dir);
}

static gint cache_manager_render_file(CleanData *cd);
static gboolean cache_manager_render_file(CleanData *cd);

static void cache_manager_render_thumb_done_cb(ThumbLoader *tl, gpointer data)
{
Expand All @@ -767,7 +767,7 @@ static void cache_manager_render_thumb_done_cb(ThumbLoader *tl, gpointer data)
while (cache_manager_render_file(cd));
}

static gint cache_manager_render_file(CleanData *cd)
static gboolean cache_manager_render_file(CleanData *cd)
{
if (cd->list)
{
Expand Down Expand Up @@ -987,7 +987,7 @@ static gint cache_manager_standard_clean_clear_cb(gpointer data)
return FALSE;
}

static void cache_manager_standard_clean_valid_cb(const gchar *path, gint valid, gpointer data)
static void cache_manager_standard_clean_valid_cb(const gchar *path, gboolean valid, gpointer data)
{
CleanData *cd = data;

Expand Down Expand Up @@ -1075,7 +1075,7 @@ static void cache_manager_standard_clean_start_cb(GenericDialog *gd, gpointer da
}
}

static void cache_manager_standard_process(GtkWidget *widget, gint clear)
static void cache_manager_standard_process(GtkWidget *widget, gboolean clear)
{
CleanData *cd;
const gchar *stock_id;
Expand Down
2 changes: 1 addition & 1 deletion src/cache_maint.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#define CACHE_MAINT_H


void cache_maintain_home(gint metadata, gint clear, GtkWidget *parent);
void cache_maintain_home(gboolean metadata, gboolean clear, GtkWidget *parent);

#if 0
gint cache_maintain_home_dir(const gchar *dir, gint recursive, gint clear);
Expand Down
4 changes: 2 additions & 2 deletions src/collect-dlg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ enum {
};


static gint collection_save_confirmed(FileDialog *fd, gint overwrite, CollectionData *cd);
static gboolean collection_save_confirmed(FileDialog *fd, gboolean overwrite, CollectionData *cd);


static void collection_confirm_ok_cb(GenericDialog *gd, gpointer data)
Expand All @@ -50,7 +50,7 @@ static void collection_confirm_cancel_cb(GenericDialog *gd, gpointer data)
/* this is a no-op, so the cancel button is added */
}

static gint collection_save_confirmed(FileDialog *fd, gint overwrite, CollectionData *cd)
static gboolean collection_save_confirmed(FileDialog *fd, gboolean overwrite, CollectionData *cd)
{
gchar *buf;

Expand Down
Loading

0 comments on commit 445675d

Please sign in to comment.