sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

r17753: fix compiler warnings and make the code simpler

Browse Source 
metze
This commit is contained in:
Stefan Metzmacher 2006-08-23 13:14:03 +00:00 committed by Gerald (Jerry) Carter
parent a4e19d6cc4
commit eda302ffa5
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/ntvfs/posix/pvfs_shortname.c
View File

@ -313,8 +313,8 @@ static BOOL is_8_3(struct pvfs_mangle_context *ctx,
try to find a 8.3 name in the cache, and if found then
return the original long name.
*/
static const char *check_cache(struct pvfs_mangle_context *ctx,
const char *name)
static char *check_cache(struct pvfs_mangle_context *ctx,
TALLOC_CTX *mem_ctx, const char *name)
{
uint32_t hash, multiplier;
unsigned int i;
@ -351,10 +351,10 @@ static const char *check_cache(struct pvfs_mangle_context *ctx,
}
if (extension[0]) {
return talloc_asprintf(ctx, "%s.%s", prefix, extension);
return talloc_asprintf(mem_ctx, "%s.%s", prefix, extension);
}
return talloc_strdup(ctx, prefix);
return talloc_strdup(mem_ctx, prefix);
}
@ -672,12 +672,7 @@ const char *pvfs_short_name(struct pvfs_state *pvfs, TALLOC_CTX *mem_ctx,
char *pvfs_mangled_lookup(struct pvfs_state *pvfs, TALLOC_CTX *mem_ctx,
const char *name)
{
const char *ret;
ret = check_cache(pvfs->mangle_ctx, name);
if (ret) {
return talloc_steal(mem_ctx, ret);
}
return NULL;
return check_cache(pvfs->mangle_ctx, mem_ctx, name);
}