const void *data;
};
-static int _eina_hash_init_count = 0;
-
#undef get16bits
#if (defined(__GNUC__) && defined(__i386__)) || defined(__WATCOMC__) \
|| defined(_MSC_VER) || defined (__BORLANDC__) || defined (__TURBOC__)
EAPI int
eina_hash_init(void)
{
- _eina_hash_init_count++;
-
- if (_eina_hash_init_count == 1)
- eina_error_init();
-
- return _eina_hash_init_count;
+ return eina_error_init();
}
/**
EAPI int
eina_hash_shutdown(void)
{
- _eina_hash_init_count--;
-
- if (_eina_hash_init_count == 0) eina_error_shutdown();
-
- return _eina_hash_init_count;
+ return eina_error_shutdown();
}
/**
int r;
r = eina_error_init();
- r += eina_hash_init();
- r += eina_stringshare_init();
- r += eina_list_init();
- r += eina_array_init();
+ eina_hash_init();
+ eina_stringshare_init();
+ eina_list_init();
+ eina_array_init();
return r;
}
eina_array_shutdown();
eina_list_shutdown();
- r = eina_stringshare_shutdown();
- r += eina_hash_shutdown();
- r += eina_error_shutdown();
+ eina_stringshare_shutdown();
+ eina_hash_shutdown();
+ r = eina_error_shutdown();
return r;
}
};
static Eina_Stringshare *share = NULL;
-static int eina_stringshare_init_count = 0;
+static int _eina_stringshare_init_count = 0;
static int
_eina_stringshare_cmp(const Eina_Stringshare_Node *node, const char *key, int length, __UNUSED__ void *data)
* No strings have been loaded at this point, so create the hash
* table for storing string info for later.
*/
- if (!eina_stringshare_init_count)
+ if (!_eina_stringshare_init_count)
{
share = calloc(1, sizeof(Eina_Stringshare));
if (!share)
return 0;
eina_error_init();
}
- eina_stringshare_init_count++;
+ _eina_stringshare_init_count++;
- return 1;
+ return _eina_stringshare_init_count;
}
/**
EAPI int
eina_stringshare_shutdown()
{
- --eina_stringshare_init_count;
- if (!eina_stringshare_init_count)
+ --_eina_stringshare_init_count;
+ if (!_eina_stringshare_init_count)
{
int i;
/* remove any string still in the table */
eina_error_shutdown();
}
- return eina_stringshare_init_count;
+ return _eina_stringshare_init_count;
}
/**