summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2001-03-14 12:45:46 +0000
committerAndrew Tridgell <tridge@samba.org>2001-03-14 12:45:46 +0000
commitfbab616c149a9549f30c7f9f0550386c815b69e8 (patch)
tree4be75218cfc0feb952f586fed0ca1417b2e146c6 /source3
parent9ea70bd00349bc391809bec374700c6d9ce2952b (diff)
downloadsamba-fbab616c149a9549f30c7f9f0550386c815b69e8.tar.gz
samba-fbab616c149a9549f30c7f9f0550386c815b69e8.tar.bz2
samba-fbab616c149a9549f30c7f9f0550386c815b69e8.zip
don't need srvstr_push_size or srvstr_pull_size
(This used to be commit d5b39a1d435f7fe79eb556f7e6b55276ac68a73d)
Diffstat (limited to 'source3')
-rw-r--r--source3/include/proto.h3
-rw-r--r--source3/smbd/srvstr.c40
2 files changed, 0 insertions, 43 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index e666f23ece..999e3e2b82 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -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 */
diff --git a/source3/smbd/srvstr.c b/source3/smbd/srvstr.c
index c3eef46440..241a74f02f 100644
--- a/source3/smbd/srvstr.c
+++ b/source3/smbd/srvstr.c
@@ -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
@@ -157,24 +135,6 @@ int srvstr_pull(void *inbuf, char *dest, const void *src, int dest_len, int src_
}
/****************************************************************************
-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
otherwise return 1 if offset is off