diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-02-27 21:03:50 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-27 21:03:50 (GMT) |
| commit | 3d0a936f63f2f894b3986d96cdd8f2baae96150c (patch) | |
| tree | f661256c3756d9d74ea2cd045115e5488f53388f /imap-send.c | |
| parent | 60b188a9844cdcf865174c685a38acc053a9d43b (diff) | |
| parent | 8e0f70033b2bd1679a6e5971978fdc3ee09bdb72 (diff) | |
| download | git-3d0a936f63f2f894b3986d96cdd8f2baae96150c.zip git-3d0a936f63f2f894b3986d96cdd8f2baae96150c.tar.gz git-3d0a936f63f2f894b3986d96cdd8f2baae96150c.tar.bz2 | |
Merge branch 'jm/free'
* jm/free:
Avoid unnecessary "if-before-free" tests.
Conflicts:
builtin-branch.c
Diffstat (limited to 'imap-send.c')
| -rw-r--r-- | imap-send.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/imap-send.c b/imap-send.c index 9025d9a..10cce15 100644 --- a/imap-send.c +++ b/imap-send.c @@ -472,7 +472,7 @@ v_issue_imap_cmd( imap_store_t *ctx, struct imap_cmd_cb *cb, if (socket_write( &imap->buf.sock, buf, bufl ) != bufl) { free( cmd->cmd ); free( cmd ); - if (cb && cb->data) + if (cb) free( cb->data ); return NULL; } @@ -858,8 +858,7 @@ get_cmd_result( imap_store_t *ctx, struct imap_cmd *tcmd ) normal: if (cmdp->cb.done) cmdp->cb.done( ctx, cmdp, resp ); - if (cmdp->cb.data) - free( cmdp->cb.data ); + free( cmdp->cb.data ); free( cmdp->cmd ); free( cmdp ); if (!tcmd || tcmd == cmdp) |