summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-04-09 12:29:34 +0200
committerMichael Adam <obnox@samba.org>2008-04-09 23:52:34 +0200
commitd3dcaac176212a20c2bb71a08b4ac39ea2689047 (patch)
tree42bcabd51b2696fab56e5fb28970b7914a0c6718
parenta8124367b4fcfea165569e4ce1e3401deacb0142 (diff)
downloadsamba-d3dcaac176212a20c2bb71a08b4ac39ea2689047.tar.gz
samba-d3dcaac176212a20c2bb71a08b4ac39ea2689047.tar.bz2
samba-d3dcaac176212a20c2bb71a08b4ac39ea2689047.zip
net (registry util): refactor printing of value without name out.
This renames print_registry_value() to print_registry_value_with_name(). The new function is called print_registry_value(). Michael (This used to be commit 88c4851ad7240bc4f72a5ef92e21629e6a4c99c6)
-rw-r--r--source3/utils/net_registry.c2
-rw-r--r--source3/utils/net_registry_util.c11
-rw-r--r--source3/utils/net_registry_util.h6
-rw-r--r--source3/utils/net_rpc_registry.c2
4 files changed, 14 insertions, 7 deletions
diff --git a/source3/utils/net_registry.c b/source3/utils/net_registry.c
index 8a45dec21c..c7cc5af493 100644
--- a/source3/utils/net_registry.c
+++ b/source3/utils/net_registry.c
@@ -156,7 +156,7 @@ static int net_registry_enumerate(int argc, const char **argv)
W_ERROR_IS_OK(werr);
count++)
{
- print_registry_value(valname, valvalue);
+ print_registry_value_with_name(valname, valvalue);
}
if (!W_ERROR_EQUAL(WERR_NO_MORE_ITEMS, werr)) {
goto done;
diff --git a/source3/utils/net_registry_util.c b/source3/utils/net_registry_util.c
index 948f8b6153..ca80e60ec3 100644
--- a/source3/utils/net_registry_util.c
+++ b/source3/utils/net_registry_util.c
@@ -32,10 +32,8 @@ void print_registry_key(const char *keyname, NTTIME *modtime)
d_printf("\n");
}
-void print_registry_value(const char *valname,
- const struct registry_value *valvalue)
+void print_registry_value(const struct registry_value *valvalue)
{
- d_printf("Valuename = %s\n", valname);
d_printf("Type = %s\n",
reg_type_lookup(valvalue->type));
switch(valvalue->type) {
@@ -62,6 +60,13 @@ void print_registry_value(const char *valname,
d_printf("Value = <unprintable>\n");
break;
}
+}
+
+void print_registry_value_with_name(const char *valname,
+ const struct registry_value *valvalue)
+{
+ d_printf("Valuename = %s\n", valname);
+ print_registry_value(valvalue);
d_printf("\n");
}
diff --git a/source3/utils/net_registry_util.h b/source3/utils/net_registry_util.h
index 13ec6ebfcd..09aaa8394b 100644
--- a/source3/utils/net_registry_util.h
+++ b/source3/utils/net_registry_util.h
@@ -24,8 +24,10 @@
void print_registry_key(const char *keyname, NTTIME *modtime);
-void print_registry_value(const char *valname,
- const struct registry_value *valvalue);
+void print_registry_value(const struct registry_value *valvalue);
+
+void print_registry_value_with_name(const char *valname,
+ const struct registry_value *valvalue);
/**
* Split path into hive name and subkeyname
diff --git a/source3/utils/net_rpc_registry.c b/source3/utils/net_rpc_registry.c
index da078f4d36..564d79e9f9 100644
--- a/source3/utils/net_rpc_registry.c
+++ b/source3/utils/net_rpc_registry.c
@@ -661,7 +661,7 @@ static NTSTATUS rpc_registry_enumerate_internal(const DOM_SID *domain_sid,
}
for (i=0; i<num_values; i++) {
- print_registry_value(names[i], values[i]);
+ print_registry_value_with_name(names[i], values[i]);
}
rpccli_winreg_CloseKey(pipe_hnd, mem_ctx, &pol_key, NULL);