diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-03-06 15:38:07 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:52:19 -0500 |
| commit | 0533fed85adefc9aa74b6d5ae6b4293fb9c11d6a (patch) | |
| tree | 8ed63337a6763ae1f40d4a6fc73e29dfd20649c6 /source4 | |
| parent | f6457b3d5408d5afe9a4de96d7623f1aa9ec39c4 (diff) | |
| download | samba-0533fed85adefc9aa74b6d5ae6b4293fb9c11d6a.tar.gz samba-0533fed85adefc9aa74b6d5ae6b4293fb9c11d6a.tar.bz2 samba-0533fed85adefc9aa74b6d5ae6b4293fb9c11d6a.zip | |
r13868: remove useless talloc_free() wrapper
metze
(This used to be commit bd3162e6a7f154630c2d88be70ce19e8dd977133)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/smb_server/smb/receive.c | 4 | ||||
| -rw-r--r-- | source4/smb_server/smb/reply.c | 8 | ||||
| -rw-r--r-- | source4/smb_server/smb/request.c | 10 |
3 files changed, 7 insertions, 15 deletions
diff --git a/source4/smb_server/smb/receive.c b/source4/smb_server/smb/receive.c index 1dc65fd5b5..bb37167e79 100644 --- a/source4/smb_server/smb/receive.c +++ b/source4/smb_server/smb/receive.c @@ -515,7 +515,7 @@ static void switch_message(int type, struct smbsrv_request *req) (req->smb_conn->signing.signing_state != SMB_SIGNING_ENGINE_OFF)) { DEBUG(1,("SKIP ERROR REPLY: %s %s because of unknown smb signing case\n", smb_fn_name(type), nt_errstr(status))); - req_destroy(req); + talloc_free(req); return; } req_reply_error(req, status); @@ -543,7 +543,7 @@ static void switch_message(int type, struct smbsrv_request *req) (req->smb_conn->signing.signing_state != SMB_SIGNING_ENGINE_OFF)) { DEBUG(1,("SKIP ERROR REPLY: %s %s because of unknown smb signing case\n", smb_fn_name(type), nt_errstr(status))); - req_destroy(req); + talloc_free(req); return; } req_reply_error(req, status); diff --git a/source4/smb_server/smb/reply.c b/source4/smb_server/smb/reply.c index a5665d3525..3c92c6f6a5 100644 --- a/source4/smb_server/smb/reply.c +++ b/source4/smb_server/smb/reply.c @@ -1759,7 +1759,7 @@ static void reply_lockingX_send(struct smbsrv_request *req) /* if it was an oplock break ack then we only send a reply if there was an error */ if (lck->lockx.in.ulock_cnt + lck->lockx.in.lock_cnt == 0) { - req_destroy(req); + talloc_free(req); return; } @@ -2336,7 +2336,7 @@ void smbsrv_reply_ntcancel(struct smbsrv_request *req) { /* NOTE: this request does not generate a reply */ ntvfs_cancel(req); - req_destroy(req); + talloc_free(req); } /**************************************************************************** @@ -2452,10 +2452,10 @@ void smbsrv_reply_special(struct smbsrv_request *req) case SMBkeepalive: /* session keepalive - swallow it */ - req_destroy(req); + talloc_free(req); return; } DEBUG(0,("Unexpected NBT session packet (%d)\n", msg_type)); - req_destroy(req); + talloc_free(req); } diff --git a/source4/smb_server/smb/request.c b/source4/smb_server/smb/request.c index eb56c9ba17..f8b58fefab 100644 --- a/source4/smb_server/smb/request.c +++ b/source4/smb_server/smb/request.c @@ -32,14 +32,6 @@ /* we over allocate the data buffer to prevent too many realloc calls */ #define REQ_OVER_ALLOCATION 0 -/* destroy a request structure */ -void req_destroy(struct smbsrv_request *req) -{ - /* ahh, its so nice to destroy a complex structure in such a - * simple way! */ - talloc_free(req); -} - /**************************************************************************** construct a basic request packet, mostly used to construct async packets such as change notify and oplock break requests @@ -304,7 +296,7 @@ void req_send_reply_nosign(struct smbsrv_request *req) if (!NT_STATUS_IS_OK(status)) { smbsrv_terminate_connection(req->smb_conn, nt_errstr(status)); } - req_destroy(req); + talloc_free(req); } /* |