diff options
| author |   tedu <tedu@openbsd.org> | 2014-11-03 16:45:00 +0000 |
|---|---|---|
| committer | tedu <tedu@openbsd.org> | 2014-11-03 16:45:00 +0000 |
| commit | 5640efa31e4cdb8cbba06a0eb1c0fa0c238cf525 (patch) | |
| tree | 975f260ff7d5160130215c4ef5e30ae663e85e55 /usr.sbin/iscsid | |
| parent | comment out no-tab-mode, since mg is currently compiled without it; (diff) | |
| download | wireguard-openbsd-5640efa31e4cdb8cbba06a0eb1c0fa0c238cf525.tar.xz wireguard-openbsd-5640efa31e4cdb8cbba06a0eb1c0fa0c238cf525.zip | |
actually use macro argument instead of shadowed variable name
Diffstat (limited to 'usr.sbin/iscsid')
| -rw-r--r-- | usr.sbin/iscsid/iscsid.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/iscsid/iscsid.c b/usr.sbin/iscsid/iscsid.c index 5d211043191..a204db9391c 100644 --- a/usr.sbin/iscsid/iscsid.c +++ b/usr.sbin/iscsid/iscsid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iscsid.c,v 1.16 2014/07/13 17:07:00 claudio Exp $ */ +/* $OpenBSD: iscsid.c,v 1.17 2014/11/03 16:45:00 tedu Exp $ */ /* * Copyright (c) 2009 Claudio Jeker <claudio@openbsd.org> @@ -315,13 +315,13 @@ done: } #define MERGE_MIN(r, a, b, v) \ - res->v = (mine->v < his->v ? mine->v : his->v) + r->v = (a->v < b->v ? a->v : b->v) #define MERGE_MAX(r, a, b, v) \ - res->v = (mine->v > his->v ? mine->v : his->v) + r->v = (a->v > b->v ? a->v : b->v) #define MERGE_OR(r, a, b, v) \ - res->v = (mine->v || his->v) + r->v = (a->v || b->v) #define MERGE_AND(r, a, b, v) \ - res->v = (mine->v && his->v) + r->v = (a->v && b->v) void iscsi_merge_sess_params(struct session_params *res, |