Changeset 223 for branches/samba-3.3.x/source/registry/reg_eventlog.c

Timestamp:

May 24, 2009, 7:51:24 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 branch to 3.3.3

File:

• branches/samba-3.3.x/source/registry/reg_eventlog.c (modified) (7 diffs)

branches/samba-3.3.x/source/registry/reg_eventlog.c

@@ -36 +36 @@
         char *evtlogpath = NULL;
         char *evtfilepath = NULL;
-        REGSUBKEY_CTR *subkeys;
+        struct regsubkey_ctr *subkeys;
         REGVAL_CTR *values;
         uint32 uiMaxSize;
@@ -43 +43 @@
         UNISTR2 data;
         TALLOC_CTX *ctx = talloc_tos();
+        WERROR werr;
 
         while (elogs && *elogs) {
-                if (!(subkeys = TALLOC_ZERO_P(ctx, REGSUBKEY_CTR ) ) ) {
+                werr = regsubkey_ctr_init(ctx, &subkeys);
+                if (!W_ERROR_IS_OK(werr)) {
                         DEBUG( 0, ( "talloc() failure!\n" ) );
                         return False;
@@ -71 +73 @@
                        ( "Adding key of [%s] to path of [%s]\n", *elogs,
                          evtlogpath ) );
-                if (!(subkeys = TALLOC_ZERO_P(ctx, REGSUBKEY_CTR))) {
+                werr = regsubkey_ctr_init(ctx, &subkeys);
+                if (!W_ERROR_IS_OK(werr)) {
                         DEBUG( 0, ( "talloc() failure!\n" ) );
                         return False;
@@ -198 +201 @@
         char **wrklist, **wp;
         char *evtlogpath = NULL;
-        REGSUBKEY_CTR *subkeys;
+        struct regsubkey_ctr *subkeys;
         REGVAL_CTR *values;
         REGISTRY_VALUE *rval;
@@ -208 +211 @@
         int numsources;
         TALLOC_CTX *ctx = talloc_tos();
+        WERROR werr;
 
         if (!elogs) {
@@ -316 +320 @@
         TALLOC_FREE(wrklist);   /*  */
 
-        if ( !( subkeys = TALLOC_ZERO_P(ctx, REGSUBKEY_CTR ) ) ) {
+        werr = regsubkey_ctr_init(ctx, &subkeys);
+        if (!W_ERROR_IS_OK(werr)) {
                 DEBUG( 0, ( "talloc() failure!\n" ) );
                 return False;
@@ -343 +348 @@
         /* now allocate room for the source's subkeys */
 
-        if ( !( subkeys = TALLOC_ZERO_P(ctx, REGSUBKEY_CTR ) ) ) {
+        werr = regsubkey_ctr_init(ctx, &subkeys);
+        if (!W_ERROR_IS_OK(werr)) {
                 DEBUG( 0, ( "talloc() failure!\n" ) );
                 return False;