elementary: Fix initializer and shawdow warnings

Signed-off-by: Mike McCormack <mikem@atratus.org>

SVN revision: 80346
This commit is contained in:
Mike McCormack 2012-12-06 11:16:08 +00:00 committed by Mike McCormack
parent f426ed101c
commit 98a3ae1ae7
1 changed files with 14 additions and 11 deletions

View File

@ -265,13 +265,16 @@ _eet_data_load(Elm_Prefs_Data *prefs_data,
case ELM_PREFS_TYPE_DATE: case ELM_PREFS_TYPE_DATE:
{ {
struct timeval val = {0}; struct timeval val;
struct tm time = {0}; struct tm t;
time.tm_year = it->value.d.y - 1900; memset(&val, 0, sizeof val);
time.tm_mon = it->value.d.m - 1; memset(&t, 0, sizeof t);
time.tm_mday = it->value.d.d;
val.tv_sec = mktime(&time); t.tm_year = it->value.d.y - 1900;
t.tm_mon = it->value.d.m - 1;
t.tm_mday = it->value.d.d;
val.tv_sec = mktime(&t);
if (!eina_value_setup(&(item->value), EINA_VALUE_TYPE_TIMEVAL)) if (!eina_value_setup(&(item->value), EINA_VALUE_TYPE_TIMEVAL))
setup_err = EINA_TRUE; setup_err = EINA_TRUE;
@ -456,15 +459,15 @@ _eet_data_save(const Elm_Prefs_Data *prefs_data,
else if (t == EINA_VALUE_TYPE_TIMEVAL) else if (t == EINA_VALUE_TYPE_TIMEVAL)
{ {
struct timeval val; struct timeval val;
struct tm *time; struct tm *tm;
if (eina_value_get(&(item->value), &val)) if (eina_value_get(&(item->value), &val))
{ {
time = gmtime(&(val.tv_sec)); tm = gmtime(&(val.tv_sec));
it->value.d.y = time->tm_year + 1900; it->value.d.y = tm->tm_year + 1900;
it->value.d.m = time->tm_mon + 1; it->value.d.m = tm->tm_mon + 1;
it->value.d.d = time->tm_mday; it->value.d.d = tm->tm_mday;
} }
else else
err = EINA_TRUE; err = EINA_TRUE;