From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Sat, 26 Aug 2017 22:32:55 +0000 (+0100)
Subject: [Minor] Remove unused functions
X-Git-Tag: 1.7.0~696
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=357bbf4c92ddb3fbc0c4292600b2ad9e95cd0a13;p=rspamd.git

[Minor] Remove unused functions
---

diff --git a/src/libutil/mem_pool.c b/src/libutil/mem_pool.c
index 4a2f54b64..8f595c1ee 100644
--- a/src/libutil/mem_pool.c
+++ b/src/libutil/mem_pool.c
@@ -537,24 +537,6 @@ rspamd_mempool_ftokdup (rspamd_mempool_t *pool, const rspamd_ftok_t *src)
 	return newstr;
 }
 
-gchar *
-rspamd_mempool_strdup_shared (rspamd_mempool_t * pool, const gchar *src)
-{
-	gsize len;
-	gchar *newstr;
-
-	if (src == NULL) {
-		return NULL;
-	}
-
-	len = strlen (src);
-	newstr = rspamd_mempool_alloc_shared (pool, len + 1);
-	memcpy (newstr, src, len);
-	newstr[len] = '\0';
-
-	return newstr;
-}
-
 void
 rspamd_mempool_add_destructor_full (rspamd_mempool_t * pool,
 	rspamd_mempool_destruct_t func,
diff --git a/src/libutil/mem_pool.h b/src/libutil/mem_pool.h
index 59a4d0615..7423895c4 100644
--- a/src/libutil/mem_pool.h
+++ b/src/libutil/mem_pool.h
@@ -197,8 +197,6 @@ gchar * rspamd_mempool_ftokdup (rspamd_mempool_t *pool,
  */
 void * rspamd_mempool_alloc_shared (rspamd_mempool_t * pool, gsize size);
 void * rspamd_mempool_alloc0_shared (rspamd_mempool_t *pool, gsize size);
-gchar * rspamd_mempool_strdup_shared (rspamd_mempool_t * pool,
-	const gchar *src);
 /**
  * Add destructor callback to pool
  * @param pool memory pool object
diff --git a/src/libutil/util.c b/src/libutil/util.c
index fbd1ba823..f2d9d41b0 100644
--- a/src/libutil/util.c
+++ b/src/libutil/util.c
@@ -1523,90 +1523,6 @@ rspamd_mutex_free (rspamd_mutex_t *mtx)
 	g_slice_free1 (sizeof (rspamd_mutex_t), mtx);
 }
 
-/**
- * Create new rwlock
- * @return
- */
-rspamd_rwlock_t *
-rspamd_rwlock_new (void)
-{
-	rspamd_rwlock_t *new;
-
-	new = g_malloc (sizeof (rspamd_rwlock_t));
-#if ((GLIB_MAJOR_VERSION == 2) && (GLIB_MINOR_VERSION > 30))
-	g_rw_lock_init (&new->rwlock);
-#else
-	g_static_rw_lock_init (&new->rwlock);
-#endif
-
-	return new;
-}
-
-/**
- * Lock rwlock for writing
- * @param mtx
- */
-inline void
-rspamd_rwlock_writer_lock (rspamd_rwlock_t *mtx)
-{
-#if ((GLIB_MAJOR_VERSION == 2) && (GLIB_MINOR_VERSION > 30))
-	g_rw_lock_writer_lock (&mtx->rwlock);
-#else
-	g_static_rw_lock_writer_lock (&mtx->rwlock);
-#endif
-}
-
-/**
- * Lock rwlock for reading
- * @param mtx
- */
-inline void
-rspamd_rwlock_reader_lock (rspamd_rwlock_t *mtx)
-{
-#if ((GLIB_MAJOR_VERSION == 2) && (GLIB_MINOR_VERSION > 30))
-	g_rw_lock_reader_lock (&mtx->rwlock);
-#else
-	g_static_rw_lock_reader_lock (&mtx->rwlock);
-#endif
-}
-
-/**
- * Unlock rwlock from writing
- * @param mtx
- */
-inline void
-rspamd_rwlock_writer_unlock (rspamd_rwlock_t *mtx)
-{
-#if ((GLIB_MAJOR_VERSION == 2) && (GLIB_MINOR_VERSION > 30))
-	g_rw_lock_writer_unlock (&mtx->rwlock);
-#else
-	g_static_rw_lock_writer_unlock (&mtx->rwlock);
-#endif
-}
-
-/**
- * Unlock rwlock from reading
- * @param mtx
- */
-inline void
-rspamd_rwlock_reader_unlock (rspamd_rwlock_t *mtx)
-{
-#if ((GLIB_MAJOR_VERSION == 2) && (GLIB_MINOR_VERSION > 30))
-	g_rw_lock_reader_unlock (&mtx->rwlock);
-#else
-	g_static_rw_lock_reader_unlock (&mtx->rwlock);
-#endif
-}
-
-void
-rspamd_rwlock_free (rspamd_rwlock_t *mtx)
-{
-#if ((GLIB_MAJOR_VERSION == 2) && (GLIB_MINOR_VERSION > 30))
-	g_rw_lock_clear (&mtx->rwlock);
-#endif
-	g_slice_free1 (sizeof (rspamd_rwlock_t), mtx);
-}
-
 struct rspamd_thread_data {
 	gchar *name;
 	gint id;
diff --git a/src/libutil/util.h b/src/libutil/util.h
index d1d83716e..d8a1eae60 100644
--- a/src/libutil/util.h
+++ b/src/libutil/util.h
@@ -229,14 +229,6 @@ typedef struct rspamd_mutex_s {
 #endif
 } rspamd_mutex_t;
 
-typedef struct rspamd_rwlock_s {
-#if ((GLIB_MAJOR_VERSION == 2) && (GLIB_MINOR_VERSION > 30))
-	GRWLock rwlock;
-#else
-	GStaticRWLock rwlock;
-#endif
-} rspamd_rwlock_t;
-
 
 /**
  * Create new mutex
@@ -262,42 +254,6 @@ void rspamd_mutex_unlock (rspamd_mutex_t *mtx);
  */
 void rspamd_mutex_free (rspamd_mutex_t *mtx);
 
-/**
- * Create new rwloc
- * @return
- */
-rspamd_rwlock_t * rspamd_rwlock_new (void);
-
-/**
- * Lock rwlock for writing
- * @param mtx
- */
-void rspamd_rwlock_writer_lock (rspamd_rwlock_t *mtx);
-
-/**
- * Lock rwlock for reading
- * @param mtx
- */
-void rspamd_rwlock_reader_lock (rspamd_rwlock_t *mtx);
-
-/**
- * Unlock rwlock from writing
- * @param mtx
- */
-void rspamd_rwlock_writer_unlock (rspamd_rwlock_t *mtx);
-
-/**
- * Unlock rwlock from reading
- * @param mtx
- */
-void rspamd_rwlock_reader_unlock (rspamd_rwlock_t *mtx);
-
-/**
- * Free rwlock
- * @param mtx
- */
-void rspamd_rwlock_free (rspamd_rwlock_t *mtx);
-
 /**
  * Create new named thread
  * @param name name pattern