trying to get HEAD building again. If you want the code

[kai/samba-autobuild/.git] / source / smbd / mangle_hash.c

diff --git a/source/smbd/mangle_hash.c b/source/smbd/mangle_hash.c
index e220d2f6d2b8e4c61e53174a444a4e00bf3745e2..ac8e425fd3960563a60c09be188036b6c7bde057 100644 (file)
--- a/source/smbd/mangle_hash.c
+++ b/source/smbd/mangle_hash.c
@@ -217,7 +217,7 @@ static NTSTATUS is_valid_name(const smb_ucs2_t *fname, BOOL allow_wildcards)
                return NT_STATUS_UNSUCCESSFUL;
        
        ret = has_valid_chars(fname, allow_wildcards);
-       if (NT_STATUS_IS_ERR(ret))
+       if (!NT_STATUS_IS_OK(ret))
                return ret;
 
        str = strdup_w(fname);
@@ -227,7 +227,8 @@ static NTSTATUS is_valid_name(const smb_ucs2_t *fname, BOOL allow_wildcards)
                SAFE_FREE(str);
                return NT_STATUS_UNSUCCESSFUL;
        }
-       if (p) *p = 0;
+       if (p)
+               *p = 0;
        strupper_w(str);
        p = &(str[1]);
 
@@ -285,10 +286,10 @@ static NTSTATUS is_8_3_w(const smb_ucs2_t *fname, BOOL allow_wildcards)
        if (strcmp_wa(fname, ".") == 0 || strcmp_wa(fname, "..") == 0)
                return NT_STATUS_OK;
 
-       if (NT_STATUS_IS_ERR(is_valid_name(fname, allow_wildcards)))
+       if (!NT_STATUS_IS_OK(is_valid_name(fname, allow_wildcards)))
                goto done;
 
-       if (NT_STATUS_IS_ERR(mangle_get_prefix(fname, &pref, &ext, allow_wildcards)))
+       if (!NT_STATUS_IS_OK(mangle_get_prefix(fname, &pref, &ext, allow_wildcards)))
                goto done;
        plen = strlen_w(pref);
 
@@ -556,8 +557,8 @@ static void cache_mangled_name( char *mangled_name, char *raw_name )
        /* Fill the new cache entry, and add it to the cache. */
        s1 = (char *)(new_entry + 1);
        s2 = (char *)&(s1[mangled_len + 1]);
-       (void)StrnCpy( s1, mangled_name, mangled_len );
-       (void)StrnCpy( s2, raw_name,     raw_len );
+       safe_strcpy( s1, mangled_name, mangled_len );
+       safe_strcpy( s2, raw_name,     raw_len );
        ubi_cachePut( mangled_cache, i, new_entry, s1 );
 }
 
@@ -660,7 +661,7 @@ static void to_8_3(char *s)
        } else
                csum = str_checksum(s);
 
-       strupper( s );
+       strupper_m( s );
 
        if( p ) {
                if( p == s )
@@ -735,7 +736,7 @@ static void name_map(char *OutName, BOOL need83, BOOL cache83)
                return;
        }
 
-       if( !need83 && NT_STATUS_IS_ERR(is_valid_name(OutName_ucs2, False)))
+       if( !need83 && !NT_STATUS_IS_OK(is_valid_name(OutName_ucs2, False)))
                need83 = True;
 
        /* check if it's already in 8.3 format */