From 687e4ae7442e9763e0587553d50a4177d2f9b6ca Mon Sep 17 00:00:00 2001 From: Cedric Bail Date: Mon, 4 Nov 2013 11:26:59 +0900 Subject: [PATCH] eina: roll const into Eina_File API. Note that eina_file_dup is const from the caller perspective as it will return a fresh "non const" Eina_File that it will be able to manipulate as it like. --- src/lib/eina/eina_file.h | 8 ++++---- src/lib/eina/eina_file_common.c | 10 ++++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/lib/eina/eina_file.h b/src/lib/eina/eina_file.h index 8384e2a22a..fa0331619e 100644 --- a/src/lib/eina/eina_file.h +++ b/src/lib/eina/eina_file.h @@ -507,7 +507,7 @@ EAPI Eina_Bool eina_file_refresh(Eina_File *file); * * @since 1.8 */ -EAPI Eina_File * eina_file_dup(Eina_File *file); +EAPI Eina_File * eina_file_dup(const Eina_File *file); /** * @brief Unref file handler. @@ -528,7 +528,7 @@ EAPI void eina_file_close(Eina_File *file); * * @since 1.1 */ -EAPI size_t eina_file_size_get(Eina_File *file); +EAPI size_t eina_file_size_get(const Eina_File *file); /** * @brief Get the last modification time of an open file. @@ -538,7 +538,7 @@ EAPI size_t eina_file_size_get(Eina_File *file); * * @since 1.1 */ -EAPI time_t eina_file_mtime_get(Eina_File *file); +EAPI time_t eina_file_mtime_get(const Eina_File *file); /** * @brief Get the filename of an open file. @@ -548,7 +548,7 @@ EAPI time_t eina_file_mtime_get(Eina_File *file); * * @since 1.1 */ -EAPI const char *eina_file_filename_get(Eina_File *file); +EAPI const char *eina_file_filename_get(const Eina_File *file); /** * @brief Get the eXtended attribute of an open file. diff --git a/src/lib/eina/eina_file_common.c b/src/lib/eina/eina_file_common.c index e5b1250e09..5a0250cc4a 100644 --- a/src/lib/eina/eina_file_common.c +++ b/src/lib/eina/eina_file_common.c @@ -431,8 +431,10 @@ eina_file_virtual(Eina_File *file) } EAPI Eina_File * -eina_file_dup(Eina_File *file) +eina_file_dup(const Eina_File *f) { + Eina_File *file = (Eina_File*) f; + if (file) { eina_lock_take(&file->lock); @@ -464,21 +466,21 @@ eina_file_close(Eina_File *file) } EAPI size_t -eina_file_size_get(Eina_File *file) +eina_file_size_get(const Eina_File *file) { EINA_SAFETY_ON_NULL_RETURN_VAL(file, 0); return file->length; } EAPI time_t -eina_file_mtime_get(Eina_File *file) +eina_file_mtime_get(const Eina_File *file) { EINA_SAFETY_ON_NULL_RETURN_VAL(file, 0); return file->mtime; } EAPI const char * -eina_file_filename_get(Eina_File *file) +eina_file_filename_get(const Eina_File *file) { EINA_SAFETY_ON_NULL_RETURN_VAL(file, NULL); return file->filename;