forked from enlightenment/enlightenment
finish char* to const char* conversion
SVN revision: 48461
This commit is contained in:
parent
ee958bebfc
commit
a6c5618f69
|
@ -1304,7 +1304,8 @@ EAPI void
|
||||||
e_fm2_parent_go(Evas_Object *obj)
|
e_fm2_parent_go(Evas_Object *obj)
|
||||||
{
|
{
|
||||||
E_Fm2_Smart_Data *sd;
|
E_Fm2_Smart_Data *sd;
|
||||||
char *path, *p;
|
char *p;
|
||||||
|
const char *path;
|
||||||
|
|
||||||
sd = evas_object_smart_data_get(obj);
|
sd = evas_object_smart_data_get(obj);
|
||||||
if (!sd) return; // safety
|
if (!sd) return; // safety
|
||||||
|
@ -9691,7 +9692,7 @@ static void
|
||||||
_e_fm2_volume_mount(void *data, E_Menu *m, E_Menu_Item *mi)
|
_e_fm2_volume_mount(void *data, E_Menu *m, E_Menu_Item *mi)
|
||||||
{
|
{
|
||||||
E_Volume *v;
|
E_Volume *v;
|
||||||
char *mp;
|
const char *mp;
|
||||||
|
|
||||||
v = data;
|
v = data;
|
||||||
if (!v) return;
|
if (!v) return;
|
||||||
|
|
|
@ -144,7 +144,7 @@ e_fm2_hal_volume_add(E_Volume *v)
|
||||||
if ((!v->mount_point) || (v->mount_point[0] == 0))
|
if ((!v->mount_point) || (v->mount_point[0] == 0))
|
||||||
{
|
{
|
||||||
char buf[PATH_MAX];
|
char buf[PATH_MAX];
|
||||||
char *id;
|
const char *id;
|
||||||
|
|
||||||
if (v->mount_point) eina_stringshare_del(v->mount_point);
|
if (v->mount_point) eina_stringshare_del(v->mount_point);
|
||||||
v->mount_point = NULL;
|
v->mount_point = NULL;
|
||||||
|
@ -378,7 +378,7 @@ e_fm2_hal_volume_find(const char *udi)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI char *
|
EAPI const char *
|
||||||
e_fm2_hal_volume_mountpoint_get(E_Volume *v)
|
e_fm2_hal_volume_mountpoint_get(E_Volume *v)
|
||||||
{
|
{
|
||||||
char buf[PATH_MAX] = {0};
|
char buf[PATH_MAX] = {0};
|
||||||
|
|
|
@ -14,7 +14,7 @@ EAPI E_Storage *e_fm2_hal_storage_find(const char *udi);
|
||||||
EAPI void e_fm2_hal_volume_add(E_Volume *s);
|
EAPI void e_fm2_hal_volume_add(E_Volume *s);
|
||||||
EAPI void e_fm2_hal_volume_del(E_Volume *s);
|
EAPI void e_fm2_hal_volume_del(E_Volume *s);
|
||||||
EAPI E_Volume *e_fm2_hal_volume_find(const char *udi);
|
EAPI E_Volume *e_fm2_hal_volume_find(const char *udi);
|
||||||
EAPI char *e_fm2_hal_volume_mountpoint_get(E_Volume *v);
|
EAPI const char *e_fm2_hal_volume_mountpoint_get(E_Volume *v);
|
||||||
|
|
||||||
EAPI void e_fm2_hal_mount_add(E_Volume *v, const char *mountpoint);
|
EAPI void e_fm2_hal_mount_add(E_Volume *v, const char *mountpoint);
|
||||||
EAPI void e_fm2_hal_mount_del(E_Volume *v);
|
EAPI void e_fm2_hal_mount_del(E_Volume *v);
|
||||||
|
|
|
@ -956,7 +956,7 @@ e_volume_mount(E_Volume *v)
|
||||||
{
|
{
|
||||||
char buf[256];
|
char buf[256];
|
||||||
char buf2[256];
|
char buf2[256];
|
||||||
char *mount_point;
|
const char *mount_point;
|
||||||
Eina_List *opt = NULL;
|
Eina_List *opt = NULL;
|
||||||
|
|
||||||
if (!v || v->guard || !v->mount_point || strncmp(v->mount_point, "/media/", 7))
|
if (!v || v->guard || !v->mount_point || strncmp(v->mount_point, "/media/", 7))
|
||||||
|
|
|
@ -22,7 +22,7 @@ struct _E_Storage
|
||||||
|
|
||||||
struct
|
struct
|
||||||
{
|
{
|
||||||
char *drive, *volume;
|
const char *drive, *volume;
|
||||||
} icon;
|
} icon;
|
||||||
|
|
||||||
Eina_List *volumes;
|
Eina_List *volumes;
|
||||||
|
|
Loading…
Reference in New Issue