Changeset 745 for trunk/server/source3/registry/reg_perfcount.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/registry/reg_perfcount.c (modified) (5 diffs)

trunk/server/source3/registry/reg_perfcount.c

@@ -21 +21 @@
 
 #include "includes.h"
+#include "system/filesys.h"
+#include "../librpc/gen_ndr/perfcount.h"
+#include "registry.h"
+#include "reg_perfcount.h"
+#include "../libcli/registry/util_reg.h"
+#include "util_tdb.h"
 
 #undef DBGC_CLASS
@@ -42 +48 @@
         TALLOC_CTX *ctx = talloc_tos();
 
+        path = state_path(PERFCOUNTDIR);
+        if (!directory_exist(path)) {
+                mkdir(path, 0755);
+        }
+
         path = talloc_asprintf(ctx, "%s/%s", PERFCOUNTDIR, dbname);
         if (!path) {
@@ -50 +61 @@
         TALLOC_FREE(path);
         return ret;
-}
-
-/*********************************************************************
-*********************************************************************/
-
-void perfcount_init_keys( void )
-{
-        char *p = state_path(PERFCOUNTDIR);
-
-        /* no registry keys; just create the perfmon directory */
-
-        if ( !directory_exist( p ) )
-                mkdir( p, 0755 );
-
-        return;
 }
 
@@ -619 +615 @@
         memset(buf, 0, PERFCOUNT_MAX_LEN);
         memcpy(buf, data.dptr, data.dsize);
-        begin = index(buf, '[');
-        end = index(buf, ']');
+        begin = strchr(buf, '[');
+        end = strchr(buf, ']');
         if(begin == NULL || end == NULL)
                 return False;
@@ -626 +622 @@
 
         while(start < end) {
-                stop = index(start, ',');
+                stop = strchr(start, ',');
                 if(stop == NULL)
                         stop = end;