]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3/registry: clang: Fix 'initialization value is never read'
authorNoel Power <noel.power@suse.com>
Wed, 10 Jul 2019 11:35:35 +0000 (11:35 +0000)
committerGary Lockyer <gary@samba.org>
Tue, 16 Jul 2019 22:52:25 +0000 (22:52 +0000)
Fixes:

source3/registry/reg_backend_db.c:853:9: warning: Value stored to 'result' during its initialization is never read <--[clang]
        WERROR result = WERR_OK;
               ^~~~~~   ~~~~~~~

source3/registry/reg_backend_db.c:1677:2: warning: Value stored to 'len' is never read <--[clang]
        len = 0;
        ^     ~
2 warnings generated.

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
source3/registry/reg_backend_db.c

index 7749b812c2404a823b7f624694db1e3d5aa25583..c870dc57ed624a2a49be35ea59fb13442df18bab 100644 (file)
@@ -850,20 +850,22 @@ WERROR regdb_init(void)
 
 WERROR regdb_open( void )
 {
-       WERROR result = WERR_OK;
-       char *db_path;
+       WERROR result;
+       char *db_path = NULL;
        int saved_errno;
 
        if ( regdb ) {
                DEBUG(10, ("regdb_open: incrementing refcount (%d->%d)\n",
                           regdb_refcount, regdb_refcount+1));
                regdb_refcount++;
-               return WERR_OK;
+               result = WERR_OK;
+               goto done;
        }
 
        db_path = state_path(talloc_tos(), "registry.tdb");
        if (db_path == NULL) {
-               return WERR_NOT_ENOUGH_MEMORY;
+               result = WERR_NOT_ENOUGH_MEMORY;
+               goto done;
        }
 
        become_root();
@@ -877,16 +879,17 @@ WERROR regdb_open( void )
                result = ntstatus_to_werror(map_nt_error_from_unix(saved_errno));
                DEBUG(0,("regdb_open: Failed to open %s! (%s)\n",
                         db_path, strerror(saved_errno)));
-               TALLOC_FREE(db_path);
-               return result;
+               goto done;
        }
-       TALLOC_FREE(db_path);
 
        regdb_refcount = 1;
        DEBUG(10, ("regdb_open: registry db opened. refcount reset (%d)\n",
                   regdb_refcount));
 
-       return WERR_OK;
+       result = WERR_OK;
+done:
+       TALLOC_FREE(db_path);
+       return result;
 }
 
 /***********************************************************************
@@ -1674,8 +1677,6 @@ static bool regdb_key_exists(struct db_context *db, const char *key)
        buflen = value.dsize - len;
        buf = (const char *)value.dptr + len;
 
-       len = 0;
-
        for (i = 0; i < num_items; i++) {
                if (buflen == 0) {
                        break;