Changeset 745 for trunk/server/lib/smbconf/smbconf_util.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)
• lib/smbconf/smbconf_util.c (modified) (6 diffs)

trunk/server/lib/smbconf/smbconf_util.c

@@ -40 +40 @@
  * should be called.
  */
-WERROR smbconf_init_internal(TALLOC_CTX *mem_ctx, struct smbconf_ctx **conf_ctx,
+sbcErr smbconf_init_internal(TALLOC_CTX *mem_ctx, struct smbconf_ctx **conf_ctx,
                              const char *path, struct smbconf_ops *ops)
 {
-        WERROR werr = WERR_OK;
+        sbcErr err = SBC_ERR_OK;
         struct smbconf_ctx *ctx;
 
         if (conf_ctx == NULL) {
-                return WERR_INVALID_PARAM;
+                return SBC_ERR_INVALID_PARAM;
         }
 
         ctx = talloc_zero(mem_ctx, struct smbconf_ctx);
         if (ctx == NULL) {
-                return WERR_NOMEM;
+                return SBC_ERR_NOMEM;
         }
 
         ctx->ops = ops;
 
-        werr = ctx->ops->init(ctx, path);
-        if (!W_ERROR_IS_OK(werr)) {
+        err = ctx->ops->init(ctx, path);
+        if (!SBC_ERROR_IS_OK(err)) {
                 goto fail;
         }
@@ -65 +65 @@
 
         *conf_ctx = ctx;
-        return werr;
+        return err;
 
 fail:
         talloc_free(ctx);
-        return werr;
+        return err;
 }
 
@@ -76 +76 @@
  * add a string to a talloced array of strings.
  */
-WERROR smbconf_add_string_to_array(TALLOC_CTX *mem_ctx,
+sbcErr smbconf_add_string_to_array(TALLOC_CTX *mem_ctx,
                                    char ***array,
                                    uint32_t count,
@@ -84 +84 @@
 
         if (array == NULL) {
-                return WERR_INVALID_PARAM;
+                return SBC_ERR_INVALID_PARAM;
         }
 
         new_array = talloc_realloc(mem_ctx, *array, char *, count + 1);
         if (new_array == NULL) {
-                return WERR_NOMEM;
+                return SBC_ERR_NOMEM;
         }
 
@@ -98 +98 @@
                 if (new_array[count] == NULL) {
                         talloc_free(new_array);
-                        return WERR_NOMEM;
+                        return SBC_ERR_NOMEM;
                 }
         }
@@ -104 +104 @@
         *array = new_array;
 
-        return WERR_OK;
+        return SBC_ERR_OK;
 }