summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-08-25 07:07:03 +0200
committerDan McGee <dan@archlinux.org>2011-08-25 23:12:33 +0200
commit6aa9fdce5ac59f4137567c17043fdd9e73b03518 (patch)
tree18aa4ab43a227a2049a69866f76152ee0e2ba8bc
parent0ee3ce70a88a42387d19f0d58901fda21b0161b7 (diff)
downloadpacman-6aa9fdce5ac59f4137567c17043fdd9e73b03518.tar.gz
pacman-6aa9fdce5ac59f4137567c17043fdd9e73b03518.tar.xz
Remove trans is NULL check in QUESTION/EVENT/PROGRESS macros
trans cannot (and better not) be NULL at any point when these are being called. Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--lib/libalpm/trans.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libalpm/trans.h b/lib/libalpm/trans.h
index 9a60e71b..6d5c08d1 100644
--- a/lib/libalpm/trans.h
+++ b/lib/libalpm/trans.h
@@ -49,19 +49,19 @@ struct __alpm_trans_t {
#define EVENT(t, e, d1, d2) \
do { \
- if((t) && (t)->cb_event) { \
+ if((t)->cb_event) { \
(t)->cb_event(e, d1, d2); \
} \
} while(0)
#define QUESTION(t, q, d1, d2, d3, r) \
do { \
- if((t) && (t)->cb_conv) { \
+ if((t)->cb_conv) { \
(t)->cb_conv(q, d1, d2, d3, r); \
} \
} while(0)
#define PROGRESS(t, e, p, per, h, r) \
do { \
- if((t) && (t)->cb_progress) { \
+ if((t)->cb_progress) { \
(t)->cb_progress(e, p, per, h, r); \
} \
} while(0)