sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-04 08:22:08 +03:00
Code Activity

s3-charcnv: Remove unused pull_string_fn

Browse Source 
Found by callcatcher: http://www.skynet.ie/~caolan/Packages/callcatcher.html

Andrew Bartlett
This commit is contained in:
Andrew Bartlett
2012-02-09 11:11:10 +11:00
parent 983d205486
commit 3b88c1e605
2 changed files with 0 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source3/include/proto.h
View File

@ -76,13 +76,6 @@ size_t push_string_check_fn(void *dest, const char *src,
size_t push_string_base(const char *base, uint16 flags2, size_t push_string_base(const char *base, uint16 flags2,
void *dest, const char *src, void *dest, const char *src,
size_t dest_len, int flags); size_t dest_len, int flags);
size_t pull_string_fn(const void *base_ptr,
uint16 smb_flags2,
char *dest,
const void *src,
size_t dest_len,
size_t src_len,
int flags);
size_t pull_string_talloc(TALLOC_CTX *ctx, size_t pull_string_talloc(TALLOC_CTX *ctx,
const void *base_ptr, const void *base_ptr,
uint16 smb_flags2, uint16 smb_flags2,

35
source3/lib/charcnv.c
View File

@ -520,41 +520,6 @@ size_t push_string_base(const char *base, uint16 flags2,
return push_ascii(dest, src, dest_len, flags); return push_ascii(dest, src, dest_len, flags);
} }
/**
Copy a string from a unicode or ascii source (depending on
the packet flags) to a char* destination.
Flags can have:
STR_TERMINATE means the string in src is null terminated.
STR_UNICODE means to force as unicode.
STR_ASCII use ascii even with unicode packet.
STR_NOALIGN means don't do alignment.
if STR_TERMINATE is set then src_len is ignored is it is -1
src_len is the length of the source area in bytes.
Return the number of bytes occupied by the string in src.
The resulting string in "dest" is always null terminated.
**/
size_t pull_string_fn(const void *base_ptr,
uint16 smb_flags2,
char *dest,
const void *src,
size_t dest_len,
size_t src_len,
int flags)
{
if ((base_ptr == NULL) && ((flags & (STR_ASCII|STR_UNICODE)) == 0)) {
smb_panic("No base ptr to get flg2 and neither ASCII nor "
"UNICODE defined");
}
if (!(flags & STR_ASCII) && \
((flags & STR_UNICODE || \
(smb_flags2 & FLAGS2_UNICODE_STRINGS)))) {
return pull_ucs2(base_ptr, dest, src, dest_len, src_len, flags);
}
return pull_ascii(dest, src, dest_len, src_len, flags);
}
/** /**
Copy a string from a unicode or ascii source (depending on Copy a string from a unicode or ascii source (depending on
the packet flags) to a char* destination. the packet flags) to a char* destination.