sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-05 20:58:40 +03:00
Code

don't need srvstr_push_size or srvstr_pull_size

Browse Source
This commit is contained in:
Andrew Tridgell -
parent 34a0821e08
commit d5b39a1d43
2 changed files with 0 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/include/proto.h
View File

@ -4074,10 +4074,7 @@ void close_cnum(connection_struct *conn, uint16 vuid);
/*The following definitions come from smbd/srvstr.c */
int srvstr_push(void *outbuf, void *dest, const char *src, int dest_len, int flags);
int srvstr_push_size(void *outbuf,
const void *dest, const char *src, int dest_len, int flags);
int srvstr_pull(void *inbuf, char *dest, const void *src, int dest_len, int src_len, int flags);
int srvstr_pull_size(void *inbuf, const void *src, int src_len);
int srvstr_align(void *inbuf, int offset);
/*The following definitions come from smbd/ssl.c */

40
source/smbd/srvstr.c
View File

@ -78,28 +78,6 @@ int srvstr_push(void *outbuf, void *dest, const char *src, int dest_len, int fla
return len;
}
/****************************************************************************
return the length that a string would occupy when copied with srvstr_push()
STR_TERMINATE means include the null termination
STR_CONVERT means convert from unix to dos codepage
STR_UPPER means uppercase in the destination
note that dest is only used for alignment purposes. No data is written.
****************************************************************************/
int srvstr_push_size(void *outbuf,
const void *dest, const char *src, int dest_len, int flags)
{
int len = strlen(src);
if (flags & STR_TERMINATE) len++;
if (!(flags & STR_ASCII) && UNICODE_FLAG(outbuf)) len *= 2;
if (!(flags & STR_ASCII) && dest && srvstr_align(outbuf, PTR_DIFF(outbuf, dest))) {
len++;
}
return len;
}
/****************************************************************************
copy a string from a unicode or ascii source (depending on flg2)
to a char* destination
@ -156,24 +134,6 @@ int srvstr_pull(void *inbuf, char *dest, const void *src, int dest_len, int src_
return len;
}
/****************************************************************************
return the length that a string would occupy (not including the null)
when copied with srvstr_pull()
if src_len is -1 then assume the source is null terminated
****************************************************************************/
int srvstr_pull_size(void *inbuf, const void *src, int src_len)
{
if (srvstr_align(inbuf, PTR_DIFF(src, inbuf))) {
src++;
if (src_len > 0) src_len--;
}
if (!UNICODE_FLAG(inbuf)) {
return strlen(src);
}
return strlen_w(src);
}
/****************************************************************************
return an alignment of either 0 or 1
if unicode is not negotiated then return 0