From f5c44485a8aa4ee135143408173578ce4daaa464 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 2 Aug 2012 16:55:47 +0000 Subject: [PATCH] some more eeze mounting cleanups SVN revision: 74812 --- src/bin/e_fm/e_fm_main_eeze.c | 7 ++++--- src/bin/e_fm/e_fm_main_eeze.h | 2 -- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/bin/e_fm/e_fm_main_eeze.c b/src/bin/e_fm/e_fm_main_eeze.c index 102e94576..564b672e8 100644 --- a/src/bin/e_fm/e_fm_main_eeze.c +++ b/src/bin/e_fm/e_fm_main_eeze.c @@ -45,6 +45,7 @@ static void _e_fm_main_eeze_storage_rescan(const char *syspath); static void _e_fm_main_eeze_volume_rescan(const char *syspath); static E_Volume *_e_fm_main_eeze_volume_find_fast(const char *syspath); static E_Storage *_e_fm_main_eeze_storage_find_fast(const char *syspath); +static void _e_fm_main_eeze_volume_del(const char *syspath); static Eina_List *_e_stores = NULL; static Eina_List *_e_vols = NULL; @@ -341,7 +342,7 @@ _e_fm_main_eeze_volume_add(const char *syspath, Eeze_Disk_Type type; if (!syspath) return NULL; - if (e_volume_find(syspath)) return NULL; + if (_e_fm_main_eeze_volume_find_fast(syspath)) return NULL; v = calloc(1, sizeof(E_Volume)); if (!v) return NULL; v->disk = eeze_disk_new(syspath); @@ -463,12 +464,12 @@ _e_fm_main_eeze_volume_add(const char *syspath, return v; } -void +static void _e_fm_main_eeze_volume_del(const char *syspath) { E_Volume *v; - v = e_volume_find(syspath); + v = _e_fm_main_eeze_volume_find_fast(syspath); if (!v) return; if (v->guard) { diff --git a/src/bin/e_fm/e_fm_main_eeze.h b/src/bin/e_fm/e_fm_main_eeze.h index 6fbcc5a17..5870052d1 100644 --- a/src/bin/e_fm/e_fm_main_eeze.h +++ b/src/bin/e_fm/e_fm_main_eeze.h @@ -1,8 +1,6 @@ #ifndef E_FM_MAIN_EEZE_H #define E_FM_MAIN_EEZE_H -E_Volume *_e_fm_main_eeze_volume_add(const char *syspath, Eina_Bool first_time); -void _e_fm_main_eeze_volume_del(const char *syspath); E_Volume *_e_fm_main_eeze_volume_find(const char *syspath); void _e_fm_main_eeze_volume_eject(E_Volume *v);