From: Michael Adam <obnox@samba.org>
Date: Sun, 13 Apr 2008 10:46:21 +0000 (+0200)
Subject: registry: unify debug output in the registry init functions.
X-Git-Tag: samba-3.3.0pre1~2710
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4fd9b45ffc08e7deeae58be3129832148748af13;p=thirdparty%2Fsamba.git

registry: unify debug output in the registry init functions.

Michael
---

diff --git a/source/registry/reg_init_basic.c b/source/registry/reg_init_basic.c
index 9098bc4aec2..e72765bdf2f 100644
--- a/source/registry/reg_init_basic.c
+++ b/source/registry/reg_init_basic.c
@@ -30,7 +30,8 @@ bool registry_init_basic(void)
 
 	werr = regdb_init();
 	if (!W_ERROR_IS_OK(werr)) {
-		DEBUG(1, ("Can't open the registry: %s\n", dos_errstr(werr)));
+		DEBUG(1, ("Failed to initialize the registry: %s\n",
+			  dos_errstr(werr)));
 		return false;
 	}
 	regdb_close();
diff --git a/source/registry/reg_init_full.c b/source/registry/reg_init_full.c
index e9273a044cb..04eff360578 100644
--- a/source/registry/reg_init_full.c
+++ b/source/registry/reg_init_full.c
@@ -70,16 +70,15 @@ bool init_registry( void )
 
 	werr = regdb_init();
 	if (!W_ERROR_IS_OK(werr)) {
-		DEBUG(0, ("init_registry: failed to initialize the registry "
-			  "(%s)\n", dos_errstr(werr)));
+		DEBUG(0, ("Failed to initialize the registry: %s\n",
+			  dos_errstr(werr)));
 		goto fail;
 	}
 
 	/* setup the necessary keys and values */
 
 	if ( !init_registry_data() ) {
-		DEBUG(0, ("regdb_init: Failed to initialize data in "
-			  "registry!\n"));
+		DEBUG(0, ("Failed to initialize data in registry!\n"));
 		goto fail;
 	}
 
diff --git a/source/registry/reg_init_smbconf.c b/source/registry/reg_init_smbconf.c
index 8d2fe53b53c..670f7a9c5de 100644
--- a/source/registry/reg_init_smbconf.c
+++ b/source/registry/reg_init_smbconf.c
@@ -82,17 +82,17 @@ bool registry_init_smbconf(const char *keyname)
 
 	werr = regdb_init();
 	if (!W_ERROR_IS_OK(werr)) {
-		DEBUG(1, ("Can't open the registry: %s\n", dos_errstr(werr)));
+		DEBUG(1, ("Failed to initialize the registry: %s\n",
+			  dos_errstr(werr)));
 		goto done;
 	}
 	if (!init_registry_key(keyname)) {
-		DEBUG(1, ("Could not initialize registry key '%s'\n",
-			  keyname));
+		DEBUG(1, ("Failed to initialize registry key '%s'\n", keyname));
 		goto done;
 	}
 	reghook_cache_init();
 	if (!reghook_cache_add(keyname, &smbconf_reg_ops)) {
-		DEBUG(1, ("Error adding smbconf reghooks to reghook cache.\n"));
+		DEBUG(1, ("Failed to add smbconf reghooks to reghook cache\n"));
 		goto done;
 	}