Rev 5326: renaming underscore functions: in http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/

[Michael Adam]

At http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/

------------------------------------------------------------
revno: 5326
revision-id: ma at sernet.de-20070404055454-48fee1bcab048c9f
parent: ma at sernet.de-20070403214112-fc711ae2210566e7
committer: Michael Adam <ma at sernet.de>
branch nick: SAMBA_3_0-registry.bzr
timestamp: Wed 2007-04-04 07:54:54 +0200
message:
  renaming underscore functions:
  * _open_path to smbconf_open_path
  * __open_path to smbconf_open_path_q
  * _open_basepath to smbconf_open_basepath
modified:
  source/utils/net_conf.c        net_conf.c-20070228210606-uywdn1acd043wgvt-1
=== modified file 'source/utils/net_conf.c'
--- a/source/utils/net_conf.c	2007-04-03 21:41:12 +0000
+++ b/source/utils/net_conf.c	2007-04-04 05:54:54 +0000
@@ -190,10 +190,11 @@
 
 /* 
  * Open a subkey of KEY_SMBCONF (i.e a service)
- * - variant without error output -
+ * - variant without error output (q = quiet)-
  */
-static WERROR __open_path(TALLOC_CTX *ctx, const char *subkeyname,
-			 uint32 desired_access, struct registry_key **key)
+static WERROR smbconf_open_path_q(TALLOC_CTX *ctx, const char *subkeyname,
+			 	  uint32 desired_access, 
+				  struct registry_key **key)
 {
 	WERROR werr = WERR_OK;
 	char *path = NULL;
@@ -216,12 +217,13 @@
  * Open a subkey of KEY_SMBCONF (i.e a service)
  * - variant with error output -
  */
-static WERROR _open_path(TALLOC_CTX *ctx, const char *subkeyname,
-			 uint32 desired_access, struct registry_key **key)
+static WERROR smbconf_open_path(TALLOC_CTX *ctx, const char *subkeyname,
+				uint32 desired_access, 
+				struct registry_key **key)
 {
 	WERROR werr = WERR_OK;
 
-	werr = __open_path(ctx, subkeyname, desired_access, key);
+	werr = smbconf_open_path_q(ctx, subkeyname, desired_access, key);
 	if (!W_ERROR_IS_OK(werr)) {
 		d_fprintf(stderr, "Error opening registry path '%s\\%s': %s\n",
 			  KEY_SMBCONF, 
@@ -235,10 +237,10 @@
 /*
  * open the base key KEY_SMBCONF
  */
-static WERROR _open_basepath(TALLOC_CTX *ctx, uint32 desired_access,
-			     struct registry_key **key)
+static WERROR smbconf_open_basepath(TALLOC_CTX *ctx, uint32 desired_access,
+			     	    struct registry_key **key)
 {
-	return _open_path(ctx, NULL, desired_access, key);
+	return smbconf_open_path(ctx, NULL, desired_access, key);
 }
 
 /*
@@ -249,7 +251,7 @@
 	WERROR werr = WERR_OK;
 	struct registry_key *key = NULL;
 
-	werr = _open_basepath(ctx, REG_KEY_WRITE, &key);
+	werr = smbconf_open_basepath(ctx, REG_KEY_WRITE, &key);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
@@ -285,7 +287,7 @@
 		goto done;
 	}
 
-	werr = _open_basepath(create_ctx, REG_KEY_WRITE, &create_parent);
+	werr = smbconf_open_basepath(create_ctx, REG_KEY_WRITE, &create_parent);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
@@ -321,7 +323,7 @@
 		goto done;
 	}
 
-	werr = __open_path(mem_ctx, subkeyname, REG_KEY_READ, &key);
+	werr = smbconf_open_path_q(mem_ctx, subkeyname, REG_KEY_READ, &key);
 	if (W_ERROR_IS_OK(werr)) {
 		ret = True;
 	}
@@ -339,7 +341,7 @@
         struct registry_value *valvalue = NULL;
         char *valname = NULL;
 	
-	werr = _open_basepath(ctx, REG_KEY_WRITE, &key);
+	werr = smbconf_open_basepath(ctx, REG_KEY_WRITE, &key);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
@@ -420,7 +422,7 @@
 					  dos_errstr(werr));
 				goto done;
 			}
-			werr = _open_basepath(ctx, REG_KEY_WRITE, &key);
+			werr = smbconf_open_basepath(ctx, REG_KEY_WRITE, &key);
 			if (!W_ERROR_IS_OK(werr)) {
 				goto done;
 			}
@@ -566,7 +568,7 @@
 		goto done;
 	}
 
-	werr = _open_basepath(ctx, REG_KEY_READ, &base_key);
+	werr = smbconf_open_basepath(ctx, REG_KEY_READ, &base_key);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
@@ -712,7 +714,7 @@
 		goto done;
 	}
 
-	werr = _open_basepath(ctx, SEC_RIGHTS_ENUM_SUBKEYS, &key);
+	werr = smbconf_open_basepath(ctx, SEC_RIGHTS_ENUM_SUBKEYS, &key);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
@@ -751,7 +753,7 @@
 		goto done;
 	}
 
-	werr = _open_path(ctx, argv[0], REG_KEY_READ, &key);
+	werr = smbconf_open_path(ctx, argv[0], REG_KEY_READ, &key);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
@@ -961,7 +963,7 @@
 	type = strdup_lower(argv[2]);
 	value_str = argv[3];
 
-	werr = _open_path(ctx, service, REG_KEY_READ, &key);
+	werr = smbconf_open_path(ctx, service, REG_KEY_READ, &key);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
@@ -1001,7 +1003,7 @@
 	service = strdup_lower(argv[0]);
 	param = strdup_lower(argv[1]);
 
-	werr = _open_path(ctx, service, REG_KEY_READ, &key);
+	werr = smbconf_open_path(ctx, service, REG_KEY_READ, &key);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
@@ -1041,7 +1043,7 @@
 	service = strdup_lower(argv[0]);
 	param = strdup_lower(argv[1]);
 
-	werr = _open_path(ctx, service, REG_KEY_READ, &key);
+	werr = smbconf_open_path(ctx, service, REG_KEY_READ, &key);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}