dovecot-2.2: lib-dict: Allow registering builtin dict drivers mu...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/ac259cd62fbc
changeset: 18649:ac259cd62fbc
user:      Timo Sirainen <tss at iki.fi>
date:      Tue May 12 19:12:11 2015 +0300
description:
lib-dict: Allow registering builtin dict drivers multiple times.

diffstat:

 src/lib-dict/dict-register.c |  6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diffs (25 lines):

diff -r d71fa3ae930f -r ac259cd62fbc src/lib-dict/dict-register.c
--- a/src/lib-dict/dict-register.c	Tue May 12 18:16:54 2015 +0300
+++ b/src/lib-dict/dict-register.c	Tue May 12 19:12:11 2015 +0300
@@ -3,8 +3,12 @@
 #include "lib.h"
 #include "dict-private.h"
 
+static int refcount = 0;
+
 void dict_drivers_register_builtin(void)
 {
+	if (refcount++ > 0)
+		return;
 	dict_driver_register(&dict_driver_client);
 	dict_driver_register(&dict_driver_file);
 	dict_driver_register(&dict_driver_fs);
@@ -15,6 +19,8 @@
 
 void dict_drivers_unregister_builtin(void)
 {
+	if (--refcount > 0)
+		return;
 	dict_driver_unregister(&dict_driver_client);
 	dict_driver_unregister(&dict_driver_file);
 	dict_driver_unregister(&dict_driver_fs);