s3:registry: rename reg_util.{c,h} to reg_util_internal.{c,h}

[amitay/samba.git] / source3 / registry / reg_backend_perflib.c

diff --git a/source3/registry/reg_backend_perflib.c b/source3/registry/reg_backend_perflib.c
index 999bca2682965b5d4807309d8667287d36d06b5d..da9e8521a7e9b4c6513595d298f31ba9b9f0cc40 100644 (file)
--- a/source3/registry/reg_backend_perflib.c
+++ b/source3/registry/reg_backend_perflib.c
@@ -25,16 +25,19 @@
  */
 
 #include "includes.h"
+#include "registry.h"
+#include "reg_util_internal.h"
+#include "reg_perfcount.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
 
-extern REGISTRY_OPS regdb_ops;
+extern struct registry_ops regdb_ops;
 
 #define KEY_PERFLIB_NORM       "HKLM/SOFTWARE/MICROSOFT/WINDOWS NT/CURRENTVERSION/PERFLIB"
 #define KEY_PERFLIB_009_NORM   "HKLM/SOFTWARE/MICROSOFT/WINDOWS NT/CURRENTVERSION/PERFLIB/009"
 
-static int perflib_params( REGVAL_CTR *regvals )
+static int perflib_params(struct regval_ctr *regvals)
 {
        int base_index = -1;
        int last_counter = -1;
@@ -42,17 +45,17 @@ static int perflib_params( REGVAL_CTR *regvals )
        int version = 0x00010001;
        
        base_index = reg_perfcount_get_base_index();
-       regval_ctr_addvalue(regvals, "Base Index", REG_DWORD, (char *)&base_index, sizeof(base_index));
+       regval_ctr_addvalue(regvals, "Base Index", REG_DWORD, (uint8_t *)&base_index, sizeof(base_index));
        last_counter = reg_perfcount_get_last_counter(base_index);
-       regval_ctr_addvalue(regvals, "Last Counter", REG_DWORD, (char *)&last_counter, sizeof(last_counter));
+       regval_ctr_addvalue(regvals, "Last Counter", REG_DWORD, (uint8_t *)&last_counter, sizeof(last_counter));
        last_help = reg_perfcount_get_last_help(last_counter);
-       regval_ctr_addvalue(regvals, "Last Help", REG_DWORD, (char *)&last_help, sizeof(last_help));
-       regval_ctr_addvalue(regvals, "Version", REG_DWORD, (char *)&version, sizeof(version));
+       regval_ctr_addvalue(regvals, "Last Help", REG_DWORD, (uint8_t *)&last_help, sizeof(last_help));
+       regval_ctr_addvalue(regvals, "Version", REG_DWORD, (uint8_t *)&version, sizeof(version));
 
        return regval_ctr_numvals( regvals );
 }
 
-static int perflib_009_params( REGVAL_CTR *regvals )
+static int perflib_009_params(struct regval_ctr *regvals)
 {
        int base_index;
        int buffer_size;
@@ -60,18 +63,18 @@ static int perflib_009_params( REGVAL_CTR *regvals )
 
        base_index = reg_perfcount_get_base_index();
        buffer_size = reg_perfcount_get_counter_names(base_index, &buffer);
-       regval_ctr_addvalue(regvals, "Counter", REG_MULTI_SZ, buffer, buffer_size);
+       regval_ctr_addvalue(regvals, "Counter", REG_MULTI_SZ, (uint8_t *)buffer, buffer_size);
        if(buffer_size > 0)
                SAFE_FREE(buffer);
        buffer_size = reg_perfcount_get_counter_help(base_index, &buffer);
-       regval_ctr_addvalue(regvals, "Help", REG_MULTI_SZ, buffer, buffer_size);
+       regval_ctr_addvalue(regvals, "Help", REG_MULTI_SZ, (uint8_t *)buffer, buffer_size);
        if(buffer_size > 0)
                SAFE_FREE(buffer);
        
        return regval_ctr_numvals( regvals );
 }
 
-static int perflib_fetch_values(const char *key, REGVAL_CTR *regvals)
+static int perflib_fetch_values(const char *key, struct regval_ctr *regvals)
 {
        char *path = NULL;
        TALLOC_CTX *ctx = talloc_tos();
@@ -95,12 +98,12 @@ static int perflib_fetch_values(const char *key, REGVAL_CTR *regvals)
 }
 
 static int perflib_fetch_subkeys(const char *key,
-                                        REGSUBKEY_CTR *subkey_ctr)
+                                struct regsubkey_ctr *subkey_ctr)
 {
        return regdb_ops.fetch_subkeys(key, subkey_ctr);
 }
 
-REGISTRY_OPS perflib_reg_ops = {
+struct registry_ops perflib_reg_ops = {
        .fetch_values = perflib_fetch_values,
        .fetch_subkeys = perflib_fetch_subkeys,
 };