Reverting r72552.

SVN revision: 72607
This commit is contained in:
Leandro Pereira 2012-06-21 13:56:42 +00:00
parent e15ba8bba1
commit d625e4d386
2 changed files with 18 additions and 34 deletions

View File

@ -313,7 +313,6 @@ _eio_dir_chmod(Ecore_Thread *thread, Eio_Dir_Copy *order,
{ {
/* destroy in reverse order so that we don't prevent change of lower dir */ /* destroy in reverse order so that we don't prevent change of lower dir */
dir = eina_list_data_get(eina_list_last(order->dirs)); dir = eina_list_data_get(eina_list_last(order->dirs));
if (!dir) continue;
order->dirs = eina_list_remove_list(order->dirs, eina_list_last(order->dirs)); order->dirs = eina_list_remove_list(order->dirs, eina_list_last(order->dirs));
/* build target dir path */ /* build target dir path */

View File

@ -414,18 +414,16 @@ eio_file_direct_stat(const char *path,
s->path = eina_stringshare_add(path); s->path = eina_stringshare_add(path);
s->done_cb = done_cb; s->done_cb = done_cb;
if (eio_file_set(&s->common, if (!eio_file_set(&s->common,
NULL, NULL,
error_cb, error_cb,
data, data,
_eio_file_stat, _eio_file_stat,
_eio_file_stat_done, _eio_file_stat_done,
_eio_file_stat_error)) _eio_file_stat_error))
return &s->common; return NULL;
eina_stringshare_del(path); return &s->common;
free(s);
return NULL;
} }
EAPI Eio_File * EAPI Eio_File *
@ -446,18 +444,16 @@ eio_file_direct_lstat(const char *path,
s->path = eina_stringshare_add(path); s->path = eina_stringshare_add(path);
s->done_cb = done_cb; s->done_cb = done_cb;
if (eio_file_set(&s->common, if (!eio_file_set(&s->common,
NULL, NULL,
error_cb, error_cb,
data, data,
_eio_file_lstat, _eio_file_lstat,
_eio_file_stat_done, _eio_file_stat_done,
_eio_file_stat_error)) _eio_file_stat_error))
return &s->common; return NULL;
eina_stringshare_del(path); return &s->common;
free(s);
return NULL;
#else #else
return eio_file_direct_stat(path, done_cb, error_cb, data); return eio_file_direct_stat(path, done_cb, error_cb, data);
#endif #endif
@ -479,18 +475,16 @@ eio_file_unlink(const char *path,
l->path = eina_stringshare_add(path); l->path = eina_stringshare_add(path);
if (eio_file_set(&l->common, if (!eio_file_set(&l->common,
done_cb, done_cb,
error_cb, error_cb,
data, data,
_eio_file_unlink, _eio_file_unlink,
_eio_file_unlink_done, _eio_file_unlink_done,
_eio_file_unlink_error)) _eio_file_unlink_error))
return &l->common; return NULL;
eina_stringshare_del(path); return &l->common;
free(l);
return NULL;
} }
EAPI Eio_File * EAPI Eio_File *
@ -511,18 +505,16 @@ eio_file_mkdir(const char *path,
r->path = eina_stringshare_add(path); r->path = eina_stringshare_add(path);
r->mode = mode; r->mode = mode;
if (eio_file_set(&r->common, if (!eio_file_set(&r->common,
done_cb, done_cb,
error_cb, error_cb,
data, data,
_eio_file_mkdir, _eio_file_mkdir,
_eio_file_mkdir_done, _eio_file_mkdir_done,
_eio_file_mkdir_error)) _eio_file_mkdir_error))
return &r->common; return NULL;
eina_stringshare_del(path); return &r->common;
free(r);
return NULL;
} }
EAPI Eio_File * EAPI Eio_File *
@ -543,18 +535,16 @@ eio_file_chmod(const char *path,
r->path = eina_stringshare_add(path); r->path = eina_stringshare_add(path);
r->mode = mode; r->mode = mode;
if (eio_file_set(&r->common, if (!eio_file_set(&r->common,
done_cb, done_cb,
error_cb, error_cb,
data, data,
_eio_file_chmod, _eio_file_chmod,
_eio_file_mkdir_done, _eio_file_mkdir_done,
_eio_file_mkdir_error)) _eio_file_mkdir_error))
return &r->common; return NULL;
eina_stringshare_del(path); return &r->common;
free(r);
return NULL;
} }
EAPI Eio_File * EAPI Eio_File *
@ -577,19 +567,14 @@ eio_file_chown(const char *path,
c->user = eina_stringshare_add(user); c->user = eina_stringshare_add(user);
c->group = eina_stringshare_add(group); c->group = eina_stringshare_add(group);
if (eio_file_set(&c->common, if (!eio_file_set(&c->common,
done_cb, done_cb,
error_cb, error_cb,
data, data,
_eio_file_chown, _eio_file_chown,
_eio_file_chown_done, _eio_file_chown_done,
_eio_file_chown_error)) _eio_file_chown_error))
return &c->common; return NULL;
eina_stringshare_del(path); return &c->common;
eina_stringshare_del(user);
eina_stringshare_del(group);
free(c);
return NULL;
} }