diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-11-02 05:50:08 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-11-02 05:50:08 +0100 |
commit | 7a0e5de08d487108c604b4bab8a2c8e689808d9f (patch) | |
tree | 6f48deb16139fd705800389fe2e454cb596b6f45 /source3/include | |
parent | c537f7a91449728bbffdda628877f72db2d4e96b (diff) | |
parent | 334d590b5e769a7e893c59f06ebc5f44e76d13a6 (diff) | |
download | samba-7a0e5de08d487108c604b4bab8a2c8e689808d9f.tar.gz samba-7a0e5de08d487108c604b4bab8a2c8e689808d9f.tar.bz2 samba-7a0e5de08d487108c604b4bab8a2c8e689808d9f.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/include')
-rw-r--r-- | source3/include/srvstr.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/source3/include/srvstr.h b/source3/include/srvstr.h index 588a807f64..0e8e275655 100644 --- a/source3/include/srvstr.h +++ b/source3/include/srvstr.h @@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#define srvstr_pull(base_ptr, smb_flags2, dest, src, dest_len, src_len, flags) \ - pull_string(base_ptr, smb_flags2, dest, src, dest_len, src_len, flags) - -/* talloc version of above. */ #define srvstr_pull_talloc(ctx, base_ptr, smb_flags2, dest, src, src_len, flags) \ pull_string_talloc(ctx, base_ptr, smb_flags2, dest, src, src_len, flags) @@ -29,9 +25,5 @@ end of the smbbuf area */ -#define srvstr_pull_buf(inbuf, smb_flags2, dest, src, dest_len, flags) \ - pull_string(inbuf, smb_flags2, dest, src, dest_len, smb_bufrem(inbuf, src), flags) - -/* talloc version of above. */ #define srvstr_pull_buf_talloc(ctx, inbuf, smb_flags2, dest, src, flags) \ pull_string_talloc(ctx, inbuf, smb_flags2, dest, src, smb_bufrem(inbuf, src), flags) |