[evolution-data-server] Remove deprecated API from libedataserver.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Remove deprecated API from libedataserver.
- Date: Wed, 31 Mar 2010 20:48:26 +0000 (UTC)
commit 93f4709e25e991061f337fb5b94050e25a4f73b8
Author: Matthew Barnes <mbarnes redhat com>
Date: Wed Mar 31 14:37:13 2010 -0400
Remove deprecated API from libedataserver.
This bumps the libedataserver soname to 12.0.0.
camel/providers/imapx/camel-imapx-folder.c | 2 -
configure.ac | 4 +-
.../libedataserver/libedataserver-docs.sgml | 4 -
.../libedataserver/libedataserver-sections.txt | 112 --
.../libedataserver/tmpl/e-categories.sgml | 18 -
docs/reference/libedataserver/tmpl/e-memory.sgml | 194 ---
.../libedataserver/tmpl/e-source-list.sgml | 10 -
docs/reference/libedataserver/tmpl/e-source.sgml | 27 -
docs/reference/libedataserver/tmpl/e-util.sgml | 10 -
libedataserver/Makefile.am | 12 +-
libedataserver/e-categories.c | 43 -
libedataserver/e-categories.h | 6 -
libedataserver/e-data-server-util.c | 18 -
libedataserver/e-data-server-util.h | 5 -
libedataserver/e-iconv.c | 616 ---------
libedataserver/e-iconv.h | 50 -
libedataserver/e-memory.c | 896 ------------
libedataserver/e-memory.h | 47 +-
libedataserver/e-msgport.c | 1426 --------------------
libedataserver/e-msgport.h | 120 --
libedataserver/e-source-list.c | 25 -
libedataserver/e-source-list.h | 4 -
libedataserver/e-source.c | 58 -
libedataserver/e-source.h | 9 -
libedataserver/e-trie.c | 377 ------
libedataserver/e-trie.h | 47 -
libedataserver/md5-utils.c | 354 -----
libedataserver/md5-utils.h | 63 -
28 files changed, 7 insertions(+), 4550 deletions(-)
---
diff --git a/camel/providers/imapx/camel-imapx-folder.c b/camel/providers/imapx/camel-imapx-folder.c
index 38fdce7..35468d8 100644
--- a/camel/providers/imapx/camel-imapx-folder.c
+++ b/camel/providers/imapx/camel-imapx-folder.c
@@ -45,8 +45,6 @@
#include "camel-imapx-exception.h"
#include "camel-imapx-server.h"
-#include <libedataserver/md5-utils.h>
-
#include <stdlib.h>
#include <string.h>
diff --git a/configure.ac b/configure.ac
index 8039931..e4fd0b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,8 +55,8 @@ EDS_MICRO_VERSION=eds_micro_version
dnl ******************************
dnl Libtool versioning
dnl ******************************
-LIBEDATASERVER_CURRENT=11
-LIBEDATASERVER_REVISION=1
+LIBEDATASERVER_CURRENT=12
+LIBEDATASERVER_REVISION=0
LIBEDATASERVER_AGE=0
LIBEDATASERVERUI_CURRENT=10
diff --git a/docs/reference/libedataserver/libedataserver-docs.sgml b/docs/reference/libedataserver/libedataserver-docs.sgml
index 1cdbcab..06bafeb 100644
--- a/docs/reference/libedataserver/libedataserver-docs.sgml
+++ b/docs/reference/libedataserver/libedataserver-docs.sgml
@@ -14,25 +14,21 @@
<xi:include href="xml/e-account-list.xml"/>
<xi:include href="xml/e-categories.xml"/>
<xi:include href="xml/e-flag.xml"/>
- <xi:include href="xml/e-iconv.xml"/>
<xi:include href="xml/e-iterator.xml"/>
<xi:include href="xml/e-list.xml"/>
<xi:include href="xml/e-list-iterator.xml"/>
<xi:include href="xml/e-memory.xml"/>
- <xi:include href="xml/e-msgport.xml"/>
<xi:include href="xml/e-proxy.xml"/>
<xi:include href="xml/e-sexp.xml"/>
<xi:include href="xml/e-source.xml"/>
<xi:include href="xml/e-source-group.xml"/>
<xi:include href="xml/e-source-list.xml"/>
<xi:include href="xml/e-time-utils.xml"/>
- <xi:include href="xml/e-trie.xml"/>
<xi:include href="xml/e-uid.xml"/>
<xi:include href="xml/e-util.xml"/>
<xi:include href="xml/e-url.xml"/>
<xi:include href="xml/e-xml-hash-utils.xml"/>
<xi:include href="xml/eds-version.xml"/>
- <xi:include href="xml/md5-utils.xml"/>
</chapter>
<index id="api-index-full">
diff --git a/docs/reference/libedataserver/libedataserver-sections.txt b/docs/reference/libedataserver/libedataserver-sections.txt
index 01bbde3..d7cab67 100644
--- a/docs/reference/libedataserver/libedataserver-sections.txt
+++ b/docs/reference/libedataserver/libedataserver-sections.txt
@@ -215,7 +215,6 @@ e_source_list_new_for_gconf
e_source_list_new_for_gconf_default
e_source_list_peek_groups
e_source_list_peek_group_by_uid
-e_source_list_peek_group_by_name
e_source_list_peek_group_by_base_uri
e_source_list_peek_group_by_properties
e_source_list_peek_source_by_uid
@@ -257,8 +256,6 @@ e_source_set_relative_uri
e_source_set_absolute_uri
e_source_set_color_spec
e_source_set_readonly
-e_source_set_color
-e_source_unset_color
e_source_peek_group
e_source_peek_uid
e_source_peek_name
@@ -266,7 +263,6 @@ e_source_peek_relative_uri
e_source_peek_absolute_uri
e_source_peek_color_spec
e_source_get_readonly
-e_source_get_color
e_source_get_uri
e_source_dump_to_xml_node
e_source_to_standalone_xml
@@ -295,8 +291,6 @@ e_categories_get_list
e_categories_add
e_categories_remove
e_categories_exist
-e_categories_get_color_for
-e_categories_set_color_for
e_categories_get_icon_file_for
e_categories_set_icon_file_for
e_categories_is_searchable
@@ -305,17 +299,6 @@ e_categories_unregister_change_listener
</SECTION>
<SECTION>
-<FILE>e-iconv</FILE>
-e_iconv_charset_name
-e_iconv_open
-e_iconv
-e_iconv_close
-e_iconv_locale_charset
-e_iconv_locale_language
-e_iconv_charset_language
-</SECTION>
-
-<SECTION>
<FILE>e-memory</FILE>
EMemChunk
e_memchunk_new
@@ -325,81 +308,6 @@ e_memchunk_free
e_memchunk_empty
e_memchunk_clean
e_memchunk_destroy
-EMemPool
-EMemPoolFlags
-e_mempool_new
-e_mempool_alloc
-e_mempool_strdup
-e_mempool_flush
-e_mempool_destroy
-EStrv
-e_strv_new
-e_strv_set_ref
-e_strv_set_ref_free
-e_strv_set
-e_strv_pack
-e_strv_get
-e_strv_destroy
-EPoolv
-e_poolv_new
-e_poolv_cpy
-e_poolv_set
-e_poolv_get
-e_poolv_destroy
-</SECTION>
-
-<SECTION>
-<FILE>e-msgport</FILE>
-EDListNode
-EDList
-E_DLIST_INITIALISER
-e_dlist_init
-e_dlist_addhead
-e_dlist_addtail
-e_dlist_remove
-e_dlist_remhead
-e_dlist_remtail
-e_dlist_empty
-e_dlist_length
-EMCache
-EMCacheNode
-em_cache_new
-em_cache_destroy
-em_cache_lookup
-em_cache_node_new
-em_cache_node_unref
-em_cache_add
-em_cache_clear
-EMsgPort
-EMsg
-e_msgport_new
-e_msgport_destroy
-e_msgport_fd
-e_msgport_prfd
-e_msgport_put
-e_msgport_wait
-e_msgport_get
-e_msgport_reply
-EThread
-e_thread_t
-EThreadFunc
-e_thread_new
-e_thread_destroy
-e_thread_set_queue_limit
-e_thread_set_msg_lost
-e_thread_set_msg_destroy
-e_thread_set_reply_port
-e_thread_set_msg_received
-e_thread_put
-e_thread_busy
-EMutex
-e_mutex_t
-e_mutex_new
-e_mutex_destroy
-e_mutex_lock
-e_mutex_unlock
-e_mutex_assert_locked
-e_mutex_cond_wait
</SECTION>
<SECTION>
@@ -458,15 +366,6 @@ e_time_get_d_fmt_with_4digit_year
</SECTION>
<SECTION>
-<FILE>e-trie</FILE>
-ETrie
-e_trie_new
-e_trie_free
-e_trie_add
-e_trie_search
-</SECTION>
-
-<SECTION>
<FILE>e-uid</FILE>
e_uid_new
</SECTION>
@@ -486,7 +385,6 @@ e_uri_to_string
<SECTION>
<FILE>e-util</FILE>
tm
-e_util_mkdir_hier
e_util_strstrcase
e_util_unicode_get_utf8
e_util_utf8_strstrcase
@@ -524,16 +422,6 @@ e_xmlhash_destroy
</SECTION>
<SECTION>
-<FILE>md5-utils</FILE>
-MD5Context
-md5_get_digest
-md5_get_digest_from_file
-md5_init
-md5_update
-md5_final
-</SECTION>
-
-<SECTION>
<FILE>e-xml-utils</FILE>
e_xml_parse_file
e_xml_save_file
diff --git a/docs/reference/libedataserver/tmpl/e-categories.sgml b/docs/reference/libedataserver/tmpl/e-categories.sgml
index 4aa44b2..a2aa2b2 100644
--- a/docs/reference/libedataserver/tmpl/e-categories.sgml
+++ b/docs/reference/libedataserver/tmpl/e-categories.sgml
@@ -53,24 +53,6 @@ e-categories
@Returns:
-<!-- ##### FUNCTION e_categories_get_color_for ##### -->
-<para>
-
-</para>
-
- category:
- Returns:
-
-
-<!-- ##### FUNCTION e_categories_set_color_for ##### -->
-<para>
-
-</para>
-
- category:
- color:
-
-
<!-- ##### FUNCTION e_categories_get_icon_file_for ##### -->
<para>
diff --git a/docs/reference/libedataserver/tmpl/e-memory.sgml b/docs/reference/libedataserver/tmpl/e-memory.sgml
index 333ff7b..f1cc98f 100644
--- a/docs/reference/libedataserver/tmpl/e-memory.sgml
+++ b/docs/reference/libedataserver/tmpl/e-memory.sgml
@@ -84,197 +84,3 @@ e-memory
@m:
-<!-- ##### STRUCT EMemPool ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ENUM EMemPoolFlags ##### -->
-<para>
-
-</para>
-
- E_MEMPOOL_ALIGN_STRUCT:
- E_MEMPOOL_ALIGN_WORD:
- E_MEMPOOL_ALIGN_BYTE:
- E_MEMPOOL_ALIGN_MASK:
-
-<!-- ##### FUNCTION e_mempool_new ##### -->
-<para>
-
-</para>
-
- blocksize:
- threshold:
- flags:
- Returns:
-
-
-<!-- ##### FUNCTION e_mempool_alloc ##### -->
-<para>
-
-</para>
-
- pool:
- size:
- Returns:
-
-
-<!-- ##### FUNCTION e_mempool_strdup ##### -->
-<para>
-
-</para>
-
- pool:
- str:
- Returns:
-
-
-<!-- ##### FUNCTION e_mempool_flush ##### -->
-<para>
-
-</para>
-
- pool:
- freeall:
-
-
-<!-- ##### FUNCTION e_mempool_destroy ##### -->
-<para>
-
-</para>
-
- pool:
-
-
-<!-- ##### STRUCT EStrv ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION e_strv_new ##### -->
-<para>
-
-</para>
-
- size:
- Returns:
-
-
-<!-- ##### FUNCTION e_strv_set_ref ##### -->
-<para>
-
-</para>
-
- strv:
- index:
- str:
- Returns:
-
-
-<!-- ##### FUNCTION e_strv_set_ref_free ##### -->
-<para>
-
-</para>
-
- strv:
- index:
- str:
- Returns:
-
-
-<!-- ##### FUNCTION e_strv_set ##### -->
-<para>
-
-</para>
-
- strv:
- index:
- str:
- Returns:
-
-
-<!-- ##### FUNCTION e_strv_pack ##### -->
-<para>
-
-</para>
-
- strv:
- Returns:
-
-
-<!-- ##### FUNCTION e_strv_get ##### -->
-<para>
-
-</para>
-
- strv:
- index:
- Returns:
-
-
-<!-- ##### FUNCTION e_strv_destroy ##### -->
-<para>
-
-</para>
-
- strv:
-
-
-<!-- ##### STRUCT EPoolv ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION e_poolv_new ##### -->
-<para>
-
-</para>
-
- size:
- Returns:
-
-
-<!-- ##### FUNCTION e_poolv_cpy ##### -->
-<para>
-
-</para>
-
- dest:
- src:
- Returns:
-
-
-<!-- ##### FUNCTION e_poolv_set ##### -->
-<para>
-
-</para>
-
- poolv:
- index:
- str:
- freeit:
- Returns:
-
-
-<!-- ##### FUNCTION e_poolv_get ##### -->
-<para>
-
-</para>
-
- poolv:
- index:
- Returns:
-
-
-<!-- ##### FUNCTION e_poolv_destroy ##### -->
-<para>
-
-</para>
-
- poolv:
-
-
diff --git a/docs/reference/libedataserver/tmpl/e-source-list.sgml b/docs/reference/libedataserver/tmpl/e-source-list.sgml
index 8acd34f..cab7974 100644
--- a/docs/reference/libedataserver/tmpl/e-source-list.sgml
+++ b/docs/reference/libedataserver/tmpl/e-source-list.sgml
@@ -92,16 +92,6 @@ ESourceList
@Returns:
-<!-- ##### FUNCTION e_source_list_peek_group_by_name ##### -->
-<para>
-
-</para>
-
- list:
- name:
- Returns:
-
-
<!-- ##### FUNCTION e_source_list_peek_group_by_base_uri ##### -->
<para>
diff --git a/docs/reference/libedataserver/tmpl/e-source.sgml b/docs/reference/libedataserver/tmpl/e-source.sgml
index 0811135..d6942ca 100644
--- a/docs/reference/libedataserver/tmpl/e-source.sgml
+++ b/docs/reference/libedataserver/tmpl/e-source.sgml
@@ -151,23 +151,6 @@ ESource
@readonly:
-<!-- ##### FUNCTION e_source_set_color ##### -->
-<para>
-
-</para>
-
- source:
- color:
-
-
-<!-- ##### FUNCTION e_source_unset_color ##### -->
-<para>
-
-</para>
-
- source:
-
-
<!-- ##### FUNCTION e_source_peek_group ##### -->
<para>
@@ -231,16 +214,6 @@ ESource
@Returns:
-<!-- ##### FUNCTION e_source_get_color ##### -->
-<para>
-
-</para>
-
- source:
- color_return:
- Returns:
-
-
<!-- ##### FUNCTION e_source_get_uri ##### -->
<para>
diff --git a/docs/reference/libedataserver/tmpl/e-util.sgml b/docs/reference/libedataserver/tmpl/e-util.sgml
index f747b87..e0dea78 100644
--- a/docs/reference/libedataserver/tmpl/e-util.sgml
+++ b/docs/reference/libedataserver/tmpl/e-util.sgml
@@ -23,16 +23,6 @@ Miscellaneous utility functions for evolution-data-server.
</para>
-<!-- ##### FUNCTION e_util_mkdir_hier ##### -->
-<para>
-
-</para>
-
- path:
- mode:
- Returns:
-
-
<!-- ##### FUNCTION e_util_strstrcase ##### -->
<para>
diff --git a/libedataserver/Makefile.am b/libedataserver/Makefile.am
index 29cd1a1..74b04f5 100644
--- a/libedataserver/Makefile.am
+++ b/libedataserver/Makefile.am
@@ -18,12 +18,10 @@ libedataserver_1_2_la_SOURCES = \
e-account.c \
e-categories.c \
e-flag.c \
- e-iconv.c \
e-iterator.c \
e-list.c \
e-list-iterator.c \
e-memory.c \
- e-msgport.c \
e-proxy.c \
e-sexp.c \
e-source-group.c \
@@ -33,12 +31,10 @@ libedataserver_1_2_la_SOURCES = \
e-uid.c \
e-url.c \
e-data-server-util.c \
- e-trie.c \
e-xml-utils.c \
e-xml-hash-utils.c \
libedataserver-private.h \
- eds-version.c \
- md5-utils.c
+ eds-version.c
libedataserver_1_2_la_LIBADD = \
$(E_DATA_SERVER_LIBS) \
@@ -56,26 +52,22 @@ libedataserverinclude_HEADERS = \
e-account.h \
e-categories.h \
e-flag.h \
- e-iconv.h \
e-iterator.h \
e-list.h \
e-list-iterator.h \
e-memory.h \
- e-msgport.h \
e-proxy.h \
e-sexp.h \
e-source-group.h \
e-source-list.h \
e-source.h \
e-time-utils.h \
- e-trie.h \
e-uid.h \
e-url.h \
e-data-server-util.h \
e-xml-utils.h \
e-xml-hash-utils.h \
- eds-version.h \
- md5-utils.h
+ eds-version.h
test_source_list_CPPFLAGS = \
$(AM_CPPFLAGS) \
diff --git a/libedataserver/e-categories.c b/libedataserver/e-categories.c
index 9e8b2f2..24ee076 100644
--- a/libedataserver/e-categories.c
+++ b/libedataserver/e-categories.c
@@ -263,25 +263,15 @@ parse_categories (const gchar *contents, gsize length)
for (node = node->xmlChildrenNode; node != NULL; node = node->next) {
xmlChar *category, *icon, *searchable;
- #ifndef EDS_DISABLE_DEPRECATED
- xmlChar *color;
- #endif
category = xmlGetProp (node, (xmlChar *) "a");
icon = xmlGetProp (node, (xmlChar *) "icon");
- #ifndef EDS_DISABLE_DEPRECATED
- color = xmlGetProp (node, (xmlChar *) "color");
- #endif
searchable = xmlGetProp (node, (xmlChar *) "searchable");
if (category != NULL) {
e_categories_add (
(gchar *) category,
- #ifndef EDS_DISABLE_DEPRECATED
- (gchar *) color,
- #else
NULL,
- #endif
(gchar *) icon,
(searchable != NULL) &&
strcmp ((gchar *) searchable, "0") != 0);
@@ -290,9 +280,6 @@ parse_categories (const gchar *contents, gsize length)
xmlFree (category);
xmlFree (icon);
- #ifndef EDS_DISABLE_DEPRECATED
- xmlFree (color);
- #endif
xmlFree (searchable);
}
@@ -571,36 +558,6 @@ e_categories_exist (const gchar *category)
return (g_hash_table_lookup (categories_table, category) != NULL);
}
-#ifndef EDS_DISABLE_DEPRECATED
-/**
- * e_categories_get_color_for:
- * @category: category to retrieve the color for.
- *
- * Returns: %NULL, always
- *
- * DEPRECATED!
- */
-const gchar *
-e_categories_get_color_for (const gchar *category)
-{
- return NULL;
-}
-
-/**
- * e_categories_set_color_for:
- * @category: category to set the color for.
- * @color: X color.
- *
- * This function does nothing.
- *
- * DEPRECATED!
- */
-void
-e_categories_set_color_for (const gchar *category, const gchar *color)
-{
-}
-#endif /* EDS_DISABLE_DEPRECATED */
-
/**
* e_categories_get_icon_file_for:
* @category: category to retrieve the icon file for.
diff --git a/libedataserver/e-categories.h b/libedataserver/e-categories.h
index ab03fa8..9f01a55 100644
--- a/libedataserver/e-categories.h
+++ b/libedataserver/e-categories.h
@@ -45,12 +45,6 @@ void e_categories_unregister_change_listener
(GCallback listener,
gpointer user_data);
-#ifndef EDS_DISABLE_DEPRECATED
-const gchar * e_categories_get_color_for (const gchar *category);
-void e_categories_set_color_for (const gchar *category,
- const gchar *color);
-#endif
-
G_END_DECLS
#endif
diff --git a/libedataserver/e-data-server-util.c b/libedataserver/e-data-server-util.c
index 4269343..cb2f780 100644
--- a/libedataserver/e-data-server-util.c
+++ b/libedataserver/e-data-server-util.c
@@ -35,24 +35,6 @@
#include "e-data-server-util.h"
/**
- * e_util_mkdir_hier:
- * @path: The directory hierarchy to create.
- * @mode: The permissions to use for the directories.
- *
- * Creates a directory hierarchy based on the string @path. If @path
- * is an absolute path, the directories will be created relative to
- * the root of the file system; otherwise, the directories will be
- * created relative to the current directory.
- *
- * Returns: 0 on success; -1 on failure.
- **/
-gint
-e_util_mkdir_hier (const gchar *path, mode_t mode)
-{
- return g_mkdir_with_parents (path, mode);
-}
-
-/**
* e_util_strstrcase:
* @haystack: The string to search in.
* @needle: The string to search for.
diff --git a/libedataserver/e-data-server-util.h b/libedataserver/e-data-server-util.h
index 57e2581..45eed67 100644
--- a/libedataserver/e-data-server-util.h
+++ b/libedataserver/e-data-server-util.h
@@ -30,11 +30,6 @@ G_BEGIN_DECLS
struct tm;
-#ifndef EDS_DISABLE_DEPRECATED
-G_GNUC_DEPRECATED
-gint e_util_mkdir_hier (const gchar *path, mode_t mode);
-#endif
-
gchar *e_util_strstrcase (const gchar *haystack, const gchar *needle);
gchar *e_util_unicode_get_utf8 (const gchar *text, gunichar *out);
const gchar *e_util_utf8_strstrcase (const gchar *haystack, const gchar *needle);
diff --git a/libedataserver/e-memory.c b/libedataserver/e-memory.c
index 0854ee9..fe02c13 100644
--- a/libedataserver/e-memory.c
+++ b/libedataserver/e-memory.c
@@ -23,23 +23,6 @@
#include "e-memory.h"
#include <string.h> /* memset() */
-#include <stdlib.h> /* alloca() */
-#include <glib.h>
-
-#define s(x) /* strv debug */
-#define p(x) /* poolv debug */
-#define p2(x) /* poolv assertion checking */
-
-/*#define MALLOC_CHECK*/
-
-/*#define PROFILE_POOLV*/
-
-#ifdef PROFILE_POOLV
-#include <time.h>
-#define pp(x) x
-#else
-#define pp(x)
-#endif
/*#define TIMEIT*/
@@ -71,35 +54,6 @@ static time_end(const gchar *desc)
#define time_end(x)
#endif
-#ifdef MALLOC_CHECK
-#include <mcheck.h>
-#include <stdio.h>
-static void
-checkmem(gpointer p)
-{
- if (p) {
- gint status = mprobe(p);
-
- switch (status) {
- case MCHECK_HEAD:
- printf("Memory underrun at %p\n", p);
- abort();
- case MCHECK_TAIL:
- printf("Memory overrun at %p\n", p);
- abort();
- case MCHECK_FREE:
- printf("Double free %p\n", p);
- abort();
- }
- }
-}
-#define MPROBE(x) checkmem((gpointer)(x))
-#else
-#define MPROBE(x)
-#endif
-
-/* mempool class */
-
typedef struct _MemChunkFreeNode {
struct _MemChunkFreeNode *next;
guint atoms;
@@ -351,856 +305,6 @@ e_memchunk_destroy(MemChunk *m)
g_free(m);
}
-typedef struct _MemPoolNode {
- struct _MemPoolNode *next;
-
- gint free;
-} MemPoolNode;
-
-typedef struct _MemPoolThresholdNode {
- struct _MemPoolThresholdNode *next;
-} MemPoolThresholdNode;
-
-#define ALIGNED_SIZEOF(t) ((sizeof (t) + G_MEM_ALIGN - 1) & -G_MEM_ALIGN)
-
-typedef struct _EMemPool {
- gint blocksize;
- gint threshold;
- guint align;
- struct _MemPoolNode *blocks;
- struct _MemPoolThresholdNode *threshold_blocks;
-} MemPool;
-
-/* a pool of mempool header blocks */
-static MemChunk *mempool_memchunk;
-#ifdef G_THREADS_ENABLED
-static GStaticMutex mempool_mutex = G_STATIC_MUTEX_INIT;
-#endif
-
-/**
- * e_mempool_new:
- * @blocksize: The base blocksize to use for all system alocations.
- * @threshold: If the allocation exceeds the threshold, then it is
- * allocated separately and stored in a separate list.
- * @flags: Alignment options: E_MEMPOOL_ALIGN_STRUCT uses native
- * struct alignment, E_MEMPOOL_ALIGN_WORD aligns to 16 bits (2 bytes),
- * and E_MEMPOOL_ALIGN_BYTE aligns to the nearest byte. The default
- * is to align to native structures.
- *
- * Create a new mempool header. Mempools can be used to efficiently
- * allocate data which can then be freed as a whole.
- *
- * Mempools can also be used to efficiently allocate arbitrarily
- * aligned data (such as strings) without incurring the space overhead
- * of aligning each allocation (which is not required for strings).
- *
- * However, each allocation cannot be freed individually, only all
- * or nothing.
- *
- * Returns:
- **/
-MemPool *e_mempool_new(gint blocksize, gint threshold, EMemPoolFlags flags)
-{
- MemPool *pool;
-
-#ifdef G_THREADS_ENABLED
- g_static_mutex_lock(&mempool_mutex);
-#endif
- if (mempool_memchunk == NULL) {
- mempool_memchunk = e_memchunk_new(8, sizeof(MemPool));
- }
- pool = e_memchunk_alloc(mempool_memchunk);
-#ifdef G_THREADS_ENABLED
- g_static_mutex_unlock(&mempool_mutex);
-#endif
- if (threshold >= blocksize)
- threshold = blocksize * 2 / 3;
- pool->blocksize = blocksize;
- pool->threshold = threshold;
- pool->blocks = NULL;
- pool->threshold_blocks = NULL;
-
- switch (flags & E_MEMPOOL_ALIGN_MASK) {
- case E_MEMPOOL_ALIGN_STRUCT:
- default:
- pool->align = G_MEM_ALIGN-1;
- break;
- case E_MEMPOOL_ALIGN_WORD:
- pool->align = 2-1;
- break;
- case E_MEMPOOL_ALIGN_BYTE:
- pool->align = 1-1;
- }
- return pool;
-}
-
-/**
- * e_mempool_alloc:
- * @pool:
- * @size:
- *
- * Allocate a new data block in the mempool. Size will
- * be rounded up to the mempool's alignment restrictions
- * before being used.
- **/
-gpointer e_mempool_alloc(MemPool *pool, register gint size)
-{
- size = (size + pool->align) & (~(pool->align));
- if (size>=pool->threshold) {
- MemPoolThresholdNode *n;
-
- n = g_malloc(ALIGNED_SIZEOF(*n) + size);
- n->next = pool->threshold_blocks;
- pool->threshold_blocks = n;
- return (gchar *) n + ALIGNED_SIZEOF(*n);
- } else {
- register MemPoolNode *n;
-
- n = pool->blocks;
- if (n && n->free >= size) {
- n->free -= size;
- return (gchar *) n + ALIGNED_SIZEOF(*n) + n->free;
- }
-
- /* maybe we could do some sort of the free blocks based on size, but
- it doubt its worth it at all */
-
- n = g_malloc(ALIGNED_SIZEOF(*n) + pool->blocksize);
- n->next = pool->blocks;
- pool->blocks = n;
- n->free = pool->blocksize - size;
- return (gchar *) n + ALIGNED_SIZEOF(*n) + n->free;
- }
-}
-
-gchar *e_mempool_strdup(EMemPool *pool, const gchar *str)
-{
- gchar *out;
-
- out = e_mempool_alloc(pool, strlen(str)+1);
- strcpy(out, str);
-
- return out;
-}
-
-/**
- * e_mempool_flush:
- * @pool:
- * @freeall: Free all system allocated blocks as well.
- *
- * Flush used memory and mark allocated blocks as free.
- *
- * If @freeall is #TRUE, then all allocated blocks are free'd
- * as well. Otherwise only blocks above the threshold are
- * actually freed, and the others are simply marked as empty.
- **/
-void e_mempool_flush(MemPool *pool, gint freeall)
-{
- MemPoolThresholdNode *tn, *tw;
- MemPoolNode *pw, *pn;
-
- tw = pool->threshold_blocks;
- while (tw) {
- tn = tw->next;
- g_free(tw);
- tw = tn;
- }
- pool->threshold_blocks = NULL;
-
- if (freeall) {
- pw = pool->blocks;
- while (pw) {
- pn = pw->next;
- g_free(pw);
- pw = pn;
- }
- pool->blocks = NULL;
- } else {
- pw = pool->blocks;
- while (pw) {
- pw->free = pool->blocksize;
- pw = pw->next;
- }
- }
-}
-
-/**
- * e_mempool_destroy:
- * @pool:
- *
- * Free all memory associated with a mempool.
- **/
-void e_mempool_destroy(MemPool *pool)
-{
- if (pool) {
- e_mempool_flush(pool, 1);
-#ifdef G_THREADS_ENABLED
- g_static_mutex_lock(&mempool_mutex);
-#endif
- e_memchunk_free(mempool_memchunk, pool);
-#ifdef G_THREADS_ENABLED
- g_static_mutex_unlock(&mempool_mutex);
-#endif
- }
-}
-
-/*
- string array classes
-*/
-
-#define STRV_UNPACKED ((guchar)(~0))
-
-struct _EStrv {
- guchar length; /* how many entries we have (or the token STRV_UNPACKED) */
- gchar data[1]; /* data follows */
-};
-
-struct _s_strv_string {
- gchar *string; /* the string to output */
- gchar *free; /* a string to free, if we referenced it */
-};
-
-struct _e_strvunpacked {
- guchar type; /* we overload last to indicate this is unpacked */
- MemPool *pool; /* pool of memory for strings */
- struct _EStrv *source; /* if we were converted from a packed one, keep the source around for a while */
- guint length;
- struct _s_strv_string strings[1]; /* the string array data follows */
-};
-
-/**
- * e_strv_new:
- * @size: The number of elements in the strv. Currently this is limited
- * to 254 elements.
- *
- * Create a new strv (string array) header. strv's can be used to
- * create and work with arrays of strings that can then be compressed
- * into a space-efficient static structure. This is useful
- * where a number of strings are to be stored for lookup, and not
- * generally edited afterwards.
- *
- * The size limit is currently 254 elements. This will probably not
- * change as arrays of this size suffer significant performance
- * penalties when looking up strings with high indices.
- *
- * Returns:
- **/
-struct _EStrv *
-e_strv_new(gint size)
-{
- struct _e_strvunpacked *s;
-
- g_assert(size<255);
-
- s = g_malloc(sizeof(*s) + (size-1)*sizeof(s->strings[0]));
- s(printf("new strv=%p, size = %d bytes\n", s, sizeof(*s) + (size-1)*sizeof(gchar *)));
- s->type = STRV_UNPACKED;
- s->pool = NULL;
- s->length = size;
- s->source = NULL;
- memset(s->strings, 0, size*sizeof(s->strings[0]));
-
- return (struct _EStrv *)s;
-}
-
-static struct _e_strvunpacked *
-strv_unpack(struct _EStrv *strv)
-{
- struct _e_strvunpacked *s;
- register gchar *p;
- gint i;
-
- s(printf("unpacking\n"));
-
- s = (struct _e_strvunpacked *)e_strv_new(strv->length);
- p = strv->data;
- for (i=0;i<s->length;i++) {
- if (i>0)
- while (*p++)
- ;
- s->strings[i].string = p;
- }
- s->source = strv;
- s->type = STRV_UNPACKED;
-
- return s;
-}
-
-/**
- * e_strv_set_ref:
- * @strv:
- * @index:
- * @str:
- *
- * Set a string array element by reference. The string
- * is not copied until the array is packed.
- *
- * If @strv has been packed, then it is unpacked ready
- * for more inserts, and should be packed again once finished with.
- * The memory used by the original @strv is not freed until
- * the new strv is packed, or freed itself.
- *
- * Returns: A new EStrv if the strv has already
- * been packed, otherwise @strv.
- **/
-struct _EStrv *
-e_strv_set_ref(struct _EStrv *strv, gint index, gchar *str)
-{
- struct _e_strvunpacked *s;
-
- s(printf("set ref %d '%s'\nawkmeharder: %s\n ", index, str, str));
-
- if (strv->length != STRV_UNPACKED)
- s = strv_unpack(strv);
- else
- s = (struct _e_strvunpacked *)strv;
-
- g_assert(index>=0 && index < s->length);
-
- s->strings[index].string = str;
-
- return (struct _EStrv *)s;
-}
-
-/**
- * e_strv_set_ref_free:
- * @strv:
- * @index:
- * @str:
- *
- * Set a string by reference, similar to set_ref, but also
- * free the string when finished with it. The string
- * is not copied until the strv is packed, and not at
- * all if the index is overwritten.
- *
- * Returns: @strv if already unpacked, otherwise an packed
- * EStrv.
- **/
-struct _EStrv *
-e_strv_set_ref_free(struct _EStrv *strv, gint index, gchar *str)
-{
- struct _e_strvunpacked *s;
-
- s(printf("set ref %d '%s'\nawkmeevenharder: %s\n ", index, str, str));
-
- if (strv->length != STRV_UNPACKED)
- s = strv_unpack(strv);
- else
- s = (struct _e_strvunpacked *)strv;
-
- g_assert(index>=0 && index < s->length);
-
- s->strings[index].string = str;
- if (s->strings[index].free)
- g_free(s->strings[index].free);
- s->strings[index].free = str;
-
- return (struct _EStrv *)s;
-}
-
-/**
- * e_strv_set:
- * @strv:
- * @index:
- * @str:
- *
- * Set a string array reference. The string @str is copied
- * into the string array at location @index.
- *
- * If @strv has been packed, then it is unpacked ready
- * for more inserts, and should be packed again once finished with.
- *
- * Returns: A new EStrv if the strv has already
- * been packed, otherwise @strv.
- **/
-struct _EStrv *
-e_strv_set(struct _EStrv *strv, gint index, const gchar *str)
-{
- struct _e_strvunpacked *s;
-
- s(printf("set %d '%s'\n", index, str));
-
- if (strv->length != STRV_UNPACKED)
- s = strv_unpack(strv);
- else
- s = (struct _e_strvunpacked *)strv;
-
- g_assert(index>=0 && index < s->length);
-
- if (s->pool == NULL)
- s->pool = e_mempool_new(1024, 512, E_MEMPOOL_ALIGN_BYTE);
-
- s->strings[index].string = e_mempool_alloc(s->pool, strlen(str)+1);
- strcpy(s->strings[index].string, str);
-
- return (struct _EStrv *)s;
-}
-
-/**
- * e_strv_pack:
- * @strv:
- *
- * Pack the @strv into a space efficient structure for later lookup.
- *
- * All strings are packed into a single allocated block, separated
- * by single \0 characters, together with a count byte.
- *
- * Returns:
- **/
-struct _EStrv *
-e_strv_pack(struct _EStrv *strv)
-{
- struct _e_strvunpacked *s;
- gint len, i;
- register gchar *src, *dst;
-
- if (strv->length == STRV_UNPACKED) {
- s = (struct _e_strvunpacked *)strv;
-
- s(printf("packing string\n"));
-
- len = 0;
- for (i=0;i<s->length;i++)
- len += s->strings[i].string?strlen(s->strings[i].string)+1:1;
-
- strv = g_malloc(sizeof(*strv) + len);
- s(printf("allocating strv=%p, size = %d\n", strv, sizeof(*strv)+len));
- strv->length = s->length;
- dst = strv->data;
- for (i=0;i<s->length;i++) {
- if ((src = s->strings[i].string)) {
- while ((*dst++ = *src++))
- ;
- } else {
- *dst++ = 0;
- }
- }
- e_strv_destroy((struct _EStrv *)s);
- }
- return strv;
-}
-
-/**
- * e_strv_get:
- * @strv:
- * @index:
- *
- * Retrieve a string by index. This function works
- * identically on both packed and unpacked strv's, although
- * may be much slower on a packed strv.
- *
- * Returns:
- **/
-const gchar *
-e_strv_get(struct _EStrv *strv, gint index)
-{
- struct _e_strvunpacked *s;
- gchar *p;
-
- if (strv->length != STRV_UNPACKED) {
- g_assert(index>=0 && index < strv->length);
- p = strv->data;
- while (index > 0) {
- while (*p++ != 0)
- ;
- index--;
- }
- return p;
- } else {
- s = (struct _e_strvunpacked *)strv;
- g_assert(index>=0 && index < s->length);
- return s->strings[index].string?s->strings[index].string:"";
- }
-}
-
-/**
- * e_strv_destroy:
- * @strv:
- *
- * Free a strv and all associated memory. Works on packed
- * or unpacked strv's.
- **/
-void
-e_strv_destroy(struct _EStrv *strv)
-{
- struct _e_strvunpacked *s;
- gint i;
-
- s(printf("freeing strv\n"));
-
- if (strv->length == STRV_UNPACKED) {
- s = (struct _e_strvunpacked *)strv;
- if (s->pool)
- e_mempool_destroy(s->pool);
- if (s->source)
- e_strv_destroy(s->source);
- for (i=0;i<s->length;i++) {
- if (s->strings[i].free)
- g_free(s->strings[i].free);
- }
- }
-
- s(printf("freeing strv=%p\n", strv));
-
- g_free(strv);
-}
-
-/* string pool stuff */
-
-/* TODO:
- garbage collection, using the following technique:
- Create a memchunk for each possible size of poolv, and allocate every poolv from those
- To garbage collect, scan all memchunk internally, ignoring any free areas (or mark each
- poolv when freeing it - set length 0?), and find out which strings are not anywhere,
- then free them.
-
- OR:
- Just keep a refcount in the hashtable, instead of duplicating the key pointer.
-
- either would also require a free for the mempool, so ignore it for now */
-
-/*#define POOLV_REFCNT*/ /* Define to enable refcounting code that does
- automatic garbage collection of unused strings */
-
-static GHashTable *poolv_pool = NULL;
-static EMemPool *poolv_mempool = NULL;
-
-#ifdef MALLOC_CHECK
-static GPtrArray *poolv_table = NULL;
-#endif
-
-#ifdef PROFILE_POOLV
-static gulong poolv_hits = 0;
-static gulong poolv_misses = 0;
-static gulong poolv_mem, poolv_count;
-#endif
-
-#ifdef G_THREADS_ENABLED
-static GStaticMutex poolv_mutex = G_STATIC_MUTEX_INIT;
-#endif
-
-struct _EPoolv {
- guchar length;
- gchar *s[1];
-};
-
-/**
- * e_poolv_new: @size: The number of elements in the poolv, maximum of 254 elements.
- *
- * create a new poolv (string vector which shares a global string
- * pool). poolv's can be used to work with arrays of strings which
- * save memory by eliminating duplicated allocations of the same
- * string.
- *
- * this is useful when you have a log of read-only strings that do not
- * go away and are duplicated a lot (such as email headers).
- *
- * we should probably in the future ref count the strings contained in
- * the hash table, but for now let's not.
- *
- * Returns: new pooled string vector
- **/
-EPoolv *
-e_poolv_new(guint size)
-{
- EPoolv *poolv;
-
- g_assert(size < 255);
-
- poolv = g_malloc0(sizeof (*poolv) + (size - 1) * sizeof (gchar *));
- poolv->length = size;
-
-#ifdef G_THREADS_ENABLED
- g_static_mutex_lock(&poolv_mutex);
-#endif
- if (!poolv_pool)
- poolv_pool = g_hash_table_new(g_str_hash, g_str_equal);
-
- if (!poolv_mempool)
- poolv_mempool = e_mempool_new(32 * 1024, 512, E_MEMPOOL_ALIGN_BYTE);
-
-#ifdef MALLOC_CHECK
- {
- gint i;
-
- if (poolv_table == NULL)
- poolv_table = g_ptr_array_new();
-
- for (i=0;i<poolv_table->len;i++)
- MPROBE(poolv_table->pdata[i]);
-
- g_ptr_array_add(poolv_table, poolv);
- }
-#endif
-
-#ifdef G_THREADS_ENABLED
- g_static_mutex_unlock(&poolv_mutex);
-#endif
-
- p(printf("new poolv=%p\tsize=%d\n", poolv, sizeof(*poolv) + (size-1)*sizeof(gchar *)));
-
-#ifdef PROFILE_POOLV
- poolv_count++;
-#endif
- return poolv;
-}
-
-/**
- * e_poolv_cpy:
- * @dest: destination pooled string vector
- * @src: source pooled string vector
- *
- * Copy the contents of a pooled string vector
- *
- * Returns: @dest, which may be re-allocated if the strings
- * are different lengths.
- **/
-EPoolv *
-e_poolv_cpy(EPoolv *dest, const EPoolv *src)
-{
-#ifdef POOLV_REFCNT
- gint i;
- guint ref;
- gchar *key;
-#endif
-
- p2(g_return_val_if_fail (dest != NULL, NULL));
- p2(g_return_val_if_fail (src != NULL, NULL));
-
- MPROBE(dest);
- MPROBE(src);
-
- if (dest->length != src->length) {
- e_poolv_destroy(dest);
- dest = e_poolv_new(src->length);
- }
-
-#ifdef POOLV_REFCNT
-#ifdef G_THREADS_ENABLED
- g_static_mutex_lock(&poolv_mutex);
-#endif
- /* ref new copies */
- for (i=0;i<src->length;i++) {
- if (src->s[i]) {
- if (g_hash_table_lookup_extended(poolv_pool, src->s[i], (gpointer *)&key, (gpointer *)&ref)) {
- g_hash_table_insert(poolv_pool, key, (gpointer)(ref+1));
- } else {
- g_assert_not_reached();
- }
- }
- }
-
- /* unref the old ones */
- for (i=0;i<dest->length;i++) {
- if (dest->s[i]) {
- if (g_hash_table_lookup_extended(poolv_pool, dest->s[i], (gpointer *)&key, (gpointer *)&ref)) {
- /* if ref == 1 free it */
- g_assert(ref > 0);
- g_hash_table_insert(poolv_pool, key, (gpointer)(ref-1));
- } else {
- g_assert_not_reached();
- }
- }
- }
-#ifdef G_THREADS_ENABLED
- g_static_mutex_unlock(&poolv_mutex);
-#endif
-#endif
-
- memcpy(dest->s, src->s, src->length * sizeof (gchar *));
-
- return dest;
-}
-
-#ifdef PROFILE_POOLV
-static void
-poolv_profile_update (void)
-{
- static time_t last_time = 0;
- time_t new_time;
-
- new_time = time (NULL);
- if (new_time - last_time < 5)
- return;
-
- printf("poolv profile: %lu hits, %lu misses: %d%% hit rate, memory: %lu, instances: %lu\n",
- poolv_hits, poolv_misses,
- (gint)(100.0 * ((double) poolv_hits / (double) (poolv_hits + poolv_misses))),
- poolv_mem, poolv_count);
-
- last_time = new_time;
-}
-#endif
-
-/**
- * e_poolv_set:
- * @poolv: pooled string vector
- * @index: index in vector of string
- * @str: string to set
- * @freeit: whether the caller is releasing its reference to the
- * string
- *
- * Set a string vector reference. If the caller will no longer be
- * referencing the string, freeit should be TRUE. Otherwise, this
- * will duplicate the string if it is not found in the pool.
- *
- * Returns: @poolv
- **/
-EPoolv *
-e_poolv_set (EPoolv *poolv, gint index, gchar *str, gint freeit)
-{
-#ifdef POOLV_REFCNT
- guint ref;
- gchar *key;
-#endif
-
- p2(g_return_val_if_fail (poolv != NULL, NULL));
-
- g_assert(index >=0 && index < poolv->length);
-
- MPROBE(poolv);
-
- p(printf("setting %d `%s'\n", index, str));
-
- if (!str) {
-#ifdef POOLV_REFCNT
- if (poolv->s[index]) {
- if (g_hash_table_lookup_extended(poolv_pool, poolv->s[index], (gpointer *)&key, (gpointer *)&ref)) {
- g_assert(ref > 0);
- g_hash_table_insert(poolv_pool, key, (gpointer)(ref-1));
- } else {
- g_assert_not_reached();
- }
- }
-#endif
- poolv->s[index] = NULL;
- return poolv;
- }
-
-#ifdef G_THREADS_ENABLED
- g_static_mutex_lock(&poolv_mutex);
-#endif
-
-#ifdef POOLV_REFCNT
- if (g_hash_table_lookup_extended(poolv_pool, str, (gpointer *)&key, (gpointer *)&ref)) {
- g_hash_table_insert(poolv_pool, key, (gpointer)(ref+1));
- poolv->s[index] = key;
-# ifdef PROFILE_POOLV
- poolv_hits++;
- poolv_profile_update ();
-# endif
- } else {
-# ifdef PROFILE_POOLV
- poolv_misses++;
- poolv_mem += strlen(str);
- poolv_profile_update ();
-# endif
- poolv->s[index] = e_mempool_strdup(poolv_mempool, str);
- g_hash_table_insert(poolv_pool, poolv->s[index], (gpointer)1);
- }
-
-#else /* !POOLV_REFCNT */
- if ((poolv->s[index] = g_hash_table_lookup(poolv_pool, str)) != NULL) {
-# ifdef PROFILE_POOLV
- poolv_hits++;
- poolv_profile_update ();
-# endif
- } else {
-# ifdef PROFILE_POOLV
- poolv_misses++;
- poolv_mem += strlen(str);
- poolv_profile_update ();
-# endif
- poolv->s[index] = e_mempool_strdup(poolv_mempool, str);
- g_hash_table_insert(poolv_pool, poolv->s[index], poolv->s[index]);
- }
-#endif /* POOLV_REFCNT */
-
-#ifdef G_THREADS_ENABLED
- g_static_mutex_unlock(&poolv_mutex);
-#endif
-
- if (freeit)
- g_free(str);
-
- return poolv;
-}
-
-/**
- * e_poolv_get:
- * @poolv: pooled string vector
- * @index: index in vector of string
- *
- * Retrieve a string by index. This could possibly just be a macro.
- *
- * Since the pool is never freed, this string does not need to be
- * duplicated, but should not be modified.
- *
- * Returns: string at that index.
- **/
-const gchar *
-e_poolv_get(EPoolv *poolv, gint index)
-{
- g_assert(poolv != NULL);
- g_assert(index>= 0 && index < poolv->length);
-
- MPROBE(poolv);
-
- p(printf("get %d = `%s'\n", index, poolv->s[index]));
-
- return poolv->s[index]?poolv->s[index]:"";
-}
-
-/**
- * e_poolv_destroy:
- * @poolv: pooled string vector to free
- *
- * Free a pooled string vector. This doesn't free the strings from
- * the vector, however.
- **/
-void
-e_poolv_destroy(EPoolv *poolv)
-{
-#ifdef POOLV_REFCNT
- gint i;
- guint ref;
- gchar *key;
-
- MPROBE(poolv);
-
-#ifdef G_THREADS_ENABLED
- g_static_mutex_lock(&poolv_mutex);
-#endif
-
-#ifdef MALLOC_CHECK
- for (i=0;i<poolv_table->len;i++)
- MPROBE(poolv_table->pdata[i]);
-
- g_ptr_array_remove_fast(poolv_table, poolv);
-#endif
-
- for (i=0;i<poolv->length;i++) {
- if (poolv->s[i]) {
- if (g_hash_table_lookup_extended(poolv_pool, poolv->s[i], (gpointer *)&key, (gpointer *)&ref)) {
- /* if ref == 1 free it */
- g_assert(ref > 0);
- g_hash_table_insert(poolv_pool, key, (gpointer)(ref-1));
- } else {
- g_assert_not_reached();
- }
- }
- }
-#ifdef G_THREADS_ENABLED
- g_static_mutex_unlock(&poolv_mutex);
-#endif
-#endif
-
-#ifdef PROFILE_POOLV
- poolv_count++;
-#endif
- g_free(poolv);
-}
-
#if 0
#define CHUNK_SIZE (20)
diff --git a/libedataserver/e-memory.h b/libedataserver/e-memory.h
index 1497a53..739bc08 100644
--- a/libedataserver/e-memory.h
+++ b/libedataserver/e-memory.h
@@ -19,8 +19,8 @@
* USA
*/
-#ifndef _E_MEMORY_H
-#define _E_MEMORY_H
+#ifndef E_MEMORY_H
+#define E_MEMORY_H
#include <glib.h>
@@ -38,47 +38,6 @@ void e_memchunk_empty(EMemChunk *m);
void e_memchunk_clean(EMemChunk *m);
void e_memchunk_destroy(EMemChunk *m);
-#ifndef EDS_DISABLE_DEPRECATED
-/* mempools - allocate variable sized blocks of memory, and free as one */
-/* allocation is very fast, but cannot be freed individually */
-typedef struct _EMemPool EMemPool;
-typedef enum {
- E_MEMPOOL_ALIGN_STRUCT = 0, /* allocate to native structure alignment */
- E_MEMPOOL_ALIGN_WORD = 1, /* allocate to words - 16 bit alignment */
- E_MEMPOOL_ALIGN_BYTE = 2, /* allocate to bytes - 8 bit alignment */
- E_MEMPOOL_ALIGN_MASK = 3 /* which bits determine the alignment information */
-} EMemPoolFlags;
-
-EMemPool *e_mempool_new(gint blocksize, gint threshold, EMemPoolFlags flags);
-gpointer e_mempool_alloc(EMemPool *pool, gint size);
-gchar *e_mempool_strdup(EMemPool *pool, const gchar *str);
-void e_mempool_flush(EMemPool *pool, gint freeall);
-void e_mempool_destroy(EMemPool *pool);
-#endif /* EDS_DISABLE_DEPRECATED */
-
-#ifndef EDS_DISABLE_DEPRECATED
-/* strv's string arrays that can be efficiently modified and then compressed mainly for retrival */
-/* building is relatively fast, once compressed it takes the minimum amount of memory possible to store */
-typedef struct _EStrv EStrv;
-
-EStrv *e_strv_new(gint size);
-EStrv *e_strv_set_ref(EStrv *strv, gint index, gchar *str);
-EStrv *e_strv_set_ref_free(EStrv *strv, gint index, gchar *str);
-EStrv *e_strv_set(EStrv *strv, gint index, const gchar *str);
-EStrv *e_strv_pack(EStrv *strv);
-const gchar *e_strv_get(EStrv *strv, gint index);
-void e_strv_destroy(EStrv *strv);
-#endif /* EDS_DISABLE_DEPRECATED */
-
-/* poolv's are similar to strv's, but they store common strings */
-typedef struct _EPoolv EPoolv;
-
-EPoolv *e_poolv_new(guint size);
-EPoolv *e_poolv_cpy(EPoolv *dest, const EPoolv *src);
-EPoolv *e_poolv_set(EPoolv *poolv, gint index, gchar *str, gint freeit);
-const gchar *e_poolv_get(EPoolv *poolv, gint index);
-void e_poolv_destroy(EPoolv *poolv);
-
G_END_DECLS
-#endif /* _E_MEMORY_H */
+#endif /* E_MEMORY_H */
diff --git a/libedataserver/e-source-list.c b/libedataserver/e-source-list.c
index 4640bd6..7e9c922 100644
--- a/libedataserver/e-source-list.c
+++ b/libedataserver/e-source-list.c
@@ -420,31 +420,6 @@ e_source_list_peek_group_by_uid (ESourceList *list,
return NULL;
}
-#ifndef EDS_DISABLE_DEPRECATED
-/**
- * Note: This function isn't safe with respect of localized names,
- * use e_source_list_peek_group_by_base_uri instead.
- **/
-ESourceGroup *
-e_source_list_peek_group_by_name (ESourceList *list,
- const gchar *name)
-{
- GSList *p;
-
- g_return_val_if_fail (E_IS_SOURCE_LIST (list), NULL);
- g_return_val_if_fail (name != NULL, NULL);
-
- for (p = list->priv->groups; p != NULL; p = p->next) {
- ESourceGroup *group = E_SOURCE_GROUP (p->data);
-
- if (strcmp (e_source_group_peek_name (group), name) == 0)
- return group;
- }
-
- return NULL;
-}
-#endif
-
/**
* e_source_list_peek_group_by_base_uri:
*
diff --git a/libedataserver/e-source-list.h b/libedataserver/e-source-list.h
index 0ece32c..d613927 100644
--- a/libedataserver/e-source-list.h
+++ b/libedataserver/e-source-list.h
@@ -67,10 +67,6 @@ ESourceList *e_source_list_new_for_gconf_default (const gchar *path);
GSList *e_source_list_peek_groups (ESourceList *list);
ESourceGroup *e_source_list_peek_group_by_uid (ESourceList *list,
const gchar *uid);
-#ifndef EDS_DISABLE_DEPRECATED
-ESourceGroup *e_source_list_peek_group_by_name (ESourceList *list,
- const gchar *name);
-#endif
ESourceGroup *e_source_list_peek_group_by_base_uri (ESourceList *list, const gchar *base_uri);
ESourceGroup *e_source_list_peek_group_by_properties (ESourceList *list, const gchar *property_name, ...);
diff --git a/libedataserver/e-source.c b/libedataserver/e-source.c
index d4dc239..911c6dc 100644
--- a/libedataserver/e-source.c
+++ b/libedataserver/e-source.c
@@ -563,28 +563,6 @@ e_source_set_readonly (ESource *source,
}
-#ifndef EDS_DISABLE_DEPRECATED
-void
-e_source_set_color (ESource *source,
- guint32 color)
-{
- gchar color_spec[8];
-
- g_return_if_fail (E_IS_SOURCE (source));
-
- g_snprintf (color_spec, sizeof (color_spec), "#%06x", color);
- e_source_set_color_spec (source, color_spec);
-}
-
-void
-e_source_unset_color (ESource *source)
-{
- g_return_if_fail (E_IS_SOURCE (source));
-
- e_source_set_color_spec (source, NULL);
-}
-#endif
-
/**
* e_source_set_color_spec:
* @source: an ESource
@@ -673,42 +651,6 @@ e_source_get_readonly (ESource *source)
return source->priv->readonly;
}
-#ifndef EDS_DISABLE_DEPRECATED
-/**
- * e_source_get_color:
- * @source: An ESource
- * @color_return: Pointer to a variable where the returned color will be
- * stored.
- *
- * If @source has an associated color, return it in * color_return
- *
- * Returns: %TRUE if the @source has a defined color (and hence
- * * color_return was set), %FALSE otherwise.
- **/
-gboolean
-e_source_get_color (ESource *source,
- guint32 *color_return)
-{
- const gchar *color_spec;
- guint32 color;
-
- g_return_val_if_fail (E_IS_SOURCE (source), FALSE);
-
- color_spec = e_source_peek_color_spec (source);
-
- if (color_spec == NULL)
- return FALSE;
-
- if (sscanf (color_spec, "#%06x", &color) != 1)
- return FALSE;
-
- if (color_return != NULL)
- *color_return = color;
-
- return TRUE;
-}
-#endif
-
gchar *
e_source_get_uri (ESource *source)
{
diff --git a/libedataserver/e-source.h b/libedataserver/e-source.h
index a646260..88b8afa 100644
--- a/libedataserver/e-source.h
+++ b/libedataserver/e-source.h
@@ -82,11 +82,6 @@ void e_source_set_color_spec (ESource *source,
const gchar *color_spec);
void e_source_set_readonly (ESource *source,
gboolean readonly);
-#ifndef EDS_DISABLE_DEPRECATED
-void e_source_set_color (ESource *source,
- guint32 color);
-void e_source_unset_color (ESource *source);
-#endif
ESourceGroup *e_source_peek_group (ESource *source);
const gchar *e_source_peek_uid (ESource *source);
@@ -95,10 +90,6 @@ const gchar *e_source_peek_relative_uri (ESource *source);
const gchar *e_source_peek_absolute_uri (ESource *source);
const gchar *e_source_peek_color_spec (ESource *source);
gboolean e_source_get_readonly (ESource *source);
-#ifndef EDS_DISABLE_DEPRECATED
-gboolean e_source_get_color (ESource *source,
- guint32 *color_return);
-#endif
gchar *e_source_get_uri (ESource *source);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
