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 9098bc4aec273cef19a71b7b66827aacba58832f..e72765bdf2f1a8947b7a344532d96deaedcd3cac 100644 (file)
--- 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 e9273a044cbe93ab4d10c1f7852635465eb550d3..04eff3605789dce12bc78cdff6afc05232dac731 100644 (file)
--- 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 8d2fe53b53c65716109fdddf69b79259a21754fd..670f7a9c5dec8a4518d68768859fd868992c192c 100644 (file)
--- 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;
        }