From cb624c40573b10fbb93c14a1aa436780ffd6caa4 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Sun, 13 Apr 2008 12:46:21 +0200 Subject: registry: unify debug output in the registry init functions. Michael (This used to be commit 4fd9b45ffc08e7deeae58be3129832148748af13) --- source3/registry/reg_init_basic.c | 3 ++- source3/registry/reg_init_full.c | 7 +++---- source3/registry/reg_init_smbconf.c | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'source3') diff --git a/source3/registry/reg_init_basic.c b/source3/registry/reg_init_basic.c index 9098bc4aec..e72765bdf2 100644 --- a/source3/registry/reg_init_basic.c +++ b/source3/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/source3/registry/reg_init_full.c b/source3/registry/reg_init_full.c index e9273a044c..04eff36057 100644 --- a/source3/registry/reg_init_full.c +++ b/source3/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/source3/registry/reg_init_smbconf.c b/source3/registry/reg_init_smbconf.c index 8d2fe53b53..670f7a9c5d 100644 --- a/source3/registry/reg_init_smbconf.c +++ b/source3/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; } -- cgit