Rev 11163: Move files to a better suitable location. in file:///home/jelmer/bzr.samba/4.0-regwrite/

Jelmer Vernooij jelmer at samba.org
Thu Feb 8 15:59:14 GMT 2007


At file:///home/jelmer/bzr.samba/4.0-regwrite/

------------------------------------------------------------
revno: 11163
revision-id: jelmer at samba.org-20070208155904-yfb5n63xvx2w0kzz
parent: jelmer at samba.org-20070207151808-znhiwyn0cbnuah7z
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 4.0-regwrite
timestamp: Thu 2007-02-08 16:59:04 +0100
message:
  Move files to a better suitable location.
removed:
  source/lib/registry/common/    svn-v2:20 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2fregistry%2fcommon
renamed:
  source/lib/registry/common/reg_interface.c => source/lib/registry/interface.c svn-v2:20 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2fregistry%2fcommon%2freg_interface.c
  source/lib/registry/common/reg_util.c => source/lib/registry/util.c svn-v2:20 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2fregistry%2fcommon%2freg_util.c
modified:
  source/lib/registry/config.mk  svn-v2:851 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2fregistry%2fconfig.mk
  source/lib/registry/registry.h svn-v2:10026 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2fregistry%2fregistry.h
  source/lib/registry/tests/generic.c svn-v2:10594 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2ftorture%2flocal%2fregistry.c
  source/torture/local/config.mk svn-v2:12008 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2ftorture%2flocal%2fconfig.mk
  source/lib/registry/interface.c svn-v2:20 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2fregistry%2fcommon%2freg_interface.c
=== removed directory 'source/lib/registry/common'
=== renamed file 'source/lib/registry/common/reg_interface.c' => 'source/lib/registry/interface.c'
--- a/source/lib/registry/common/reg_interface.c	2006-08-30 11:29:34 +0000
+++ b/source/lib/registry/interface.c	2007-02-08 15:59:04 +0000
@@ -157,7 +157,11 @@
 }
 
 /** Open a registry file/host/etc */
-_PUBLIC_ WERROR reg_open_hive(TALLOC_CTX *parent_ctx, const char *backend, const char *location, struct auth_session_info *session_info, struct cli_credentials *credentials, struct registry_key **root)
+_PUBLIC_ WERROR reg_open_hive(TALLOC_CTX *parent_ctx, const char *backend, 
+							  const char *location, 
+							  struct auth_session_info *session_info, 
+							  struct cli_credentials *credentials, 
+							  struct registry_key **root)
 {
 	struct registry_hive *rethive;
 	struct registry_key *retkey = NULL;
@@ -209,7 +213,8 @@
  * First tries to use the open_key function from the backend
  * then falls back to get_subkey_by_name and later get_subkey_by_index 
  */
-_PUBLIC_ WERROR reg_open_key(TALLOC_CTX *mem_ctx, struct registry_key *parent, const char *name, struct registry_key **result)
+_PUBLIC_ WERROR reg_open_key(TALLOC_CTX *mem_ctx, struct registry_key *parent, 
+							 const char *name, struct registry_key **result)
 {
 	WERROR error;
 
@@ -263,7 +268,9 @@
 /**
  * Get value by index
  */
-_PUBLIC_ WERROR reg_key_get_value_by_index(TALLOC_CTX *mem_ctx, const struct registry_key *key, int idx, struct registry_value **val)
+_PUBLIC_ WERROR reg_key_get_value_by_index(TALLOC_CTX *mem_ctx, 
+										   const struct registry_key *key, 
+										   int idx, struct registry_value **val)
 {
 	if(!key) return WERR_INVALID_PARAM;
 
@@ -281,7 +288,8 @@
 /** 
  * Get the number of subkeys.
  */
-_PUBLIC_ WERROR reg_key_num_subkeys(const struct registry_key *key, uint32_t *count)
+_PUBLIC_ WERROR reg_key_num_subkeys(const struct registry_key *key, 
+									uint32_t *count)
 {
 	if(!key) return WERR_INVALID_PARAM;
 	
@@ -309,9 +317,9 @@
 /**
  * Get the number of values of a key.
  */
-_PUBLIC_ WERROR reg_key_num_values(const struct registry_key *key, uint32_t *count)
+_PUBLIC_ WERROR reg_key_num_values(const struct registry_key *key, 
+								   uint32_t *count)
 {
-	
 	if(!key) return WERR_INVALID_PARAM;
 
 	if (key->hive->functions->num_values) {
@@ -397,7 +405,10 @@
 /**
  * Get value by name.
  */
-_PUBLIC_ WERROR reg_key_get_value_by_name(TALLOC_CTX *mem_ctx, const struct registry_key *key, const char *name, struct registry_value **val)
+_PUBLIC_ WERROR reg_key_get_value_by_name(TALLOC_CTX *mem_ctx, 
+										  const struct registry_key *key, 
+										  const char *name, 
+										  struct registry_value **val)
 {
 	int i;
 	WERROR error = WERR_OK;

=== renamed file 'source/lib/registry/common/reg_util.c' => 'source/lib/registry/util.c'
=== modified file 'source/lib/registry/config.mk'
--- a/source/lib/registry/config.mk	2007-01-14 04:19:40 +0000
+++ b/source/lib/registry/config.mk	2007-02-08 15:59:04 +0000
@@ -1,5 +1,4 @@
 # Registry backends
-
 ################################################
 # Start MODULE registry_regf
 [MODULE::registry_regf]
@@ -93,8 +92,8 @@
 SO_VERSION = 0
 DESCRIPTION = Windows-style registry library
 OBJ_FILES = \
-		common/reg_interface.o \
-		common/reg_util.o \
+		interface.o \
+		util.o \
 		reg_samba.o \
 		patchfile_dotreg.o \
 		patchfile_preg.o \

=== modified file 'source/lib/registry/registry.h'
--- a/source/lib/registry/registry.h	2007-01-14 04:23:08 +0000
+++ b/source/lib/registry/registry.h	2007-02-08 15:59:04 +0000
@@ -2,7 +2,7 @@
    Unix SMB/CIFS implementation.
    Registry interface
    Copyright (C) Gerald Carter                        2002.
-   Copyright (C) Jelmer Vernooij					  2003-2004.
+   Copyright (C) Jelmer Vernooij					  2003-2007.
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

=== modified file 'source/lib/registry/tests/generic.c'
--- a/source/lib/registry/tests/generic.c	2007-02-07 15:18:08 +0000
+++ b/source/lib/registry/tests/generic.c	2007-02-08 15:59:04 +0000
@@ -162,7 +162,8 @@
 	torture_suite_add_simple_test(suite, "reg_val_description null", test_reg_val_description_nullname);
 
 	for (i = 0; backends[i].name; i++) {
-		torture_suite_add_simple_tcase(suite, backends[i].name, test_hive, &backends[i]);
+		torture_suite_add_simple_tcase(suite, backends[i].name, test_hive, 
+									   &backends[i]);
 	}
 
 	return suite;

=== modified file 'source/torture/local/config.mk'
--- a/source/torture/local/config.mk	2007-02-07 15:18:08 +0000
+++ b/source/torture/local/config.mk	2007-02-08 15:59:04 +0000
@@ -20,7 +20,7 @@
 		idtree.o \
 		socket.o \
 		irpc.o \
-		../../lib/registry/tests/registry.o \
+		../../lib/registry/tests/generic.o \
 		resolve.o \
 		util_strlist.o \
 		util_file.o \



More information about the samba-cvs mailing list