Author: jelmer
Date: 2007-08-04 18:03:11 +0000 (Sat, 04 Aug 2007)
New Revision: 24197

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24197

Log:
Fix more build issues.

Removed:
   branches/4.0-regwrite/source/gtk/
Modified:
   branches/4.0-regwrite/
   branches/4.0-regwrite/source/lib/registry/dir.c
   branches/4.0-regwrite/source/lib/registry/regf.c
   branches/4.0-regwrite/source/lib/registry/rpc.c
   branches/4.0-regwrite/source/lib/registry/tests/generic.c
   branches/4.0-regwrite/source/lib/registry/tools/regdiff.c
   branches/4.0-regwrite/source/lib/registry/tools/regpatch.c
   branches/4.0-regwrite/source/lib/registry/tools/regshell.c
   branches/4.0-regwrite/source/lib/registry/tools/regtree.c


Changeset:

Property changes on: branches/4.0-regwrite
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: Mon 2007-02-12 22:07:46.905999899 +0100
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
properties: 
        branch-nick: 4.0-regwrite
        rebase-of: [EMAIL PROTECTED]

   + timestamp: Tue 2007-02-13 00:53:54.213999987 +0100
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
properties: 
        branch-nick: 4.0-regwrite
        rebase-of: [EMAIL PROTECTED]

Name: bzr:file-ids
   - 
webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/table/DefaultResizeBehavior.js
     [EMAIL 
PROTECTED]:branches%2FSAMBA_4_0;fde25bcf15b4c12301c94c2ffe9cd7d081c3256a
webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/table/AbstractResizeBehavior.js
 [EMAIL PROTECTED]:branches%2FSAMBA_4_0;71c0c4c4409cc5db233f5f4d7cdbedc9ca6dd8e1
webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/table/ResizeTableColumnModel.js
 [EMAIL PROTECTED]:branches%2FSAMBA_4_0;67ece3f839f23325253d1e57191e4712ae651c39
webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/table/ResizeBehaviorColumnData.js
       [EMAIL 
PROTECTED]:branches%2FSAMBA_4_0;6dc63adab3f99f81e1a046b63729cdb948223a38

   + 
Name: bzr:revision-id:v3-trunk0
   - 11140 [EMAIL PROTECTED]
11142 [EMAIL PROTECTED]
11143 [EMAIL PROTECTED]
11144 [EMAIL PROTECTED]
11145 [EMAIL PROTECTED]
11146 [EMAIL PROTECTED]
11147 [EMAIL PROTECTED]
11148 [EMAIL PROTECTED]
11149 [EMAIL PROTECTED]
11150 [EMAIL PROTECTED]
11151 [EMAIL PROTECTED]
11152 [EMAIL PROTECTED]
11153 [EMAIL PROTECTED]
11154 [EMAIL PROTECTED]
11155 [EMAIL PROTECTED]
11156 [EMAIL PROTECTED]
11157 [EMAIL PROTECTED]
11158 [EMAIL PROTECTED]
11159 [EMAIL PROTECTED]
11160 [EMAIL PROTECTED]
11161 [EMAIL PROTECTED]
11162 [EMAIL PROTECTED]
11163 [EMAIL PROTECTED]
11164 [EMAIL PROTECTED]
11165 [EMAIL PROTECTED]
11166 [EMAIL PROTECTED]
11167 [EMAIL PROTECTED]
11168 [EMAIL PROTECTED]
11169 [EMAIL PROTECTED]

   + 11140 [EMAIL PROTECTED]
11142 [EMAIL PROTECTED]
11143 [EMAIL PROTECTED]
11144 [EMAIL PROTECTED]
11145 [EMAIL PROTECTED]
11146 [EMAIL PROTECTED]
11147 [EMAIL PROTECTED]
11148 [EMAIL PROTECTED]
11149 [EMAIL PROTECTED]
11150 [EMAIL PROTECTED]
11151 [EMAIL PROTECTED]
11152 [EMAIL PROTECTED]
11153 [EMAIL PROTECTED]
11154 [EMAIL PROTECTED]
11155 [EMAIL PROTECTED]
11156 [EMAIL PROTECTED]
11157 [EMAIL PROTECTED]
11158 [EMAIL PROTECTED]
11159 [EMAIL PROTECTED]
11160 [EMAIL PROTECTED]
11161 [EMAIL PROTECTED]
11162 [EMAIL PROTECTED]
11163 [EMAIL PROTECTED]
11164 [EMAIL PROTECTED]
11165 [EMAIL PROTECTED]
11166 [EMAIL PROTECTED]
11167 [EMAIL PROTECTED]
11168 [EMAIL PROTECTED]
11169 [EMAIL PROTECTED]
11170 [EMAIL PROTECTED]


Modified: branches/4.0-regwrite/source/lib/registry/dir.c
===================================================================
--- branches/4.0-regwrite/source/lib/registry/dir.c     2007-08-04 18:02:26 UTC 
(rev 24196)
+++ branches/4.0-regwrite/source/lib/registry/dir.c     2007-08-04 18:03:11 UTC 
(rev 24197)
@@ -123,7 +123,7 @@
 {
        if(!location) return WERR_INVALID_PARAM;
 
-       *key = talloc(h, struct registry_key);
+       *key = talloc(parent_ctx, struct registry_key);
        (*key)->backend_data = talloc_strdup(*key, location);
        return WERR_OK;
 }

Modified: branches/4.0-regwrite/source/lib/registry/regf.c
===================================================================
--- branches/4.0-regwrite/source/lib/registry/regf.c    2007-08-04 18:02:26 UTC 
(rev 24196)
+++ branches/4.0-regwrite/source/lib/registry/regf.c    2007-08-04 18:03:11 UTC 
(rev 24197)
@@ -1692,7 +1692,7 @@
        return WERR_OK;
 }
 
-static struct hive_operations reg_backend_regf = {
+static struct reg_key_operations reg_backend_regf = {
        .name = "regf",
        .num_subkeys = regf_num_subkeys,
        .num_values = regf_num_values,

Modified: branches/4.0-regwrite/source/lib/registry/rpc.c
===================================================================
--- branches/4.0-regwrite/source/lib/registry/rpc.c     2007-08-04 18:02:26 UTC 
(rev 24196)
+++ branches/4.0-regwrite/source/lib/registry/rpc.c     2007-08-04 18:03:11 UTC 
(rev 24197)
@@ -21,7 +21,7 @@
 #include "registry.h"
 #include "librpc/gen_ndr/ndr_winreg_c.h"
 
-static struct hive_operations reg_backend_rpc;
+static struct reg_key_operations reg_backend_rpc;
 
 /**
  * This is the RPC backend for the registry library.

Modified: branches/4.0-regwrite/source/lib/registry/tests/generic.c
===================================================================
--- branches/4.0-regwrite/source/lib/registry/tests/generic.c   2007-08-04 
18:02:26 UTC (rev 24196)
+++ branches/4.0-regwrite/source/lib/registry/tests/generic.c   2007-08-04 
18:03:11 UTC (rev 24197)
@@ -46,11 +46,6 @@
        const struct test_backend_settings *backend = test_data;
        TALLOC_CTX *mem_ctx = tctx;
 
-       if (!reg_has_backend(backend->name)) {
-               torture_skip(tctx, talloc_asprintf(tctx, 
-                                               "Backend '%s' support not 
compiled in", backend->name));
-       }
-
        error = reg_open_hive(mem_ctx, backend->name, 
                                                  backend->location, NULL, 
cmdline_credentials, &root);
        torture_assert_werr_ok(tctx, error, "reg_open_hive()");

Modified: branches/4.0-regwrite/source/lib/registry/tools/regdiff.c
===================================================================
--- branches/4.0-regwrite/source/lib/registry/tools/regdiff.c   2007-08-04 
18:02:26 UTC (rev 24196)
+++ branches/4.0-regwrite/source/lib/registry/tools/regdiff.c   2007-08-04 
18:03:11 UTC (rev 24197)
@@ -23,7 +23,6 @@
 #include "includes.h"
 #include "lib/registry/registry.h"
 #include "lib/events/events.h"
-#include "lib/registry/reg_backend_rpc.h"
 #include "lib/cmdline/popt_common.h"
 
 int main(int argc, const char **argv)

Modified: branches/4.0-regwrite/source/lib/registry/tools/regpatch.c
===================================================================
--- branches/4.0-regwrite/source/lib/registry/tools/regpatch.c  2007-08-04 
18:02:26 UTC (rev 24196)
+++ branches/4.0-regwrite/source/lib/registry/tools/regpatch.c  2007-08-04 
18:03:11 UTC (rev 24197)
@@ -23,7 +23,6 @@
 #include "lib/events/events.h"
 #include "lib/registry/registry.h"
 #include "lib/cmdline/popt_common.h"
-#include "lib/registry/reg_backend_rpc.h"
 
 int main(int argc, char **argv)
 {

Modified: branches/4.0-regwrite/source/lib/registry/tools/regshell.c
===================================================================
--- branches/4.0-regwrite/source/lib/registry/tools/regshell.c  2007-08-04 
18:02:26 UTC (rev 24196)
+++ branches/4.0-regwrite/source/lib/registry/tools/regshell.c  2007-08-04 
18:03:11 UTC (rev 24197)
@@ -23,7 +23,6 @@
 #include "lib/registry/registry.h"
 #include "lib/cmdline/popt_common.h"
 #include "lib/events/events.h"
-#include "lib/registry/reg_backend_rpc.h"
 #include "system/time.h"
 #include "lib/smbreadline/smbreadline.h"
 #include "librpc/gen_ndr/ndr_security.h"

Modified: branches/4.0-regwrite/source/lib/registry/tools/regtree.c
===================================================================
--- branches/4.0-regwrite/source/lib/registry/tools/regtree.c   2007-08-04 
18:02:26 UTC (rev 24196)
+++ branches/4.0-regwrite/source/lib/registry/tools/regtree.c   2007-08-04 
18:03:11 UTC (rev 24197)
@@ -22,7 +22,6 @@
 #include "includes.h"
 #include "lib/registry/registry.h"
 #include "lib/events/events.h"
-#include "lib/registry/reg_backend_rpc.h"
 #include "lib/cmdline/popt_common.h"
 
 static void print_tree(int l, struct registry_key *p, int fullpath, int novals)

Reply via email to