svn commit: r228010 - head/sys/netipsec
Pawel Jakub Dawidek
pjd at FreeBSD.org
Sat Nov 26 23:15:29 UTC 2011
Author: pjd
Date: Sat Nov 26 23:15:28 2011
New Revision: 228010
URL: http://svn.freebsd.org/changeset/base/228010
Log:
Eliminate 'err' variable and just use existing 'error'.
Modified:
head/sys/netipsec/xform_ah.c
head/sys/netipsec/xform_esp.c
Modified: head/sys/netipsec/xform_ah.c
==============================================================================
--- head/sys/netipsec/xform_ah.c Sat Nov 26 23:13:30 2011 (r228009)
+++ head/sys/netipsec/xform_ah.c Sat Nov 26 23:15:28 2011 (r228010)
@@ -1135,7 +1135,6 @@ ah_output_cb(struct cryptop *crp)
struct secasvar *sav;
struct mbuf *m;
caddr_t ptr;
- int err;
tc = (struct tdb_crypto *) crp->crp_opaque;
IPSEC_ASSERT(tc != NULL, ("null opaque data area!"));
@@ -1205,10 +1204,10 @@ ah_output_cb(struct cryptop *crp)
#endif
/* NB: m is reclaimed by ipsec_process_done. */
- err = ipsec_process_done(m, isr);
+ error = ipsec_process_done(m, isr);
KEY_FREESAV(&sav);
IPSECREQUEST_UNLOCK(isr);
- return err;
+ return error;
bad:
if (sav)
KEY_FREESAV(&sav);
Modified: head/sys/netipsec/xform_esp.c
==============================================================================
--- head/sys/netipsec/xform_esp.c Sat Nov 26 23:13:30 2011 (r228009)
+++ head/sys/netipsec/xform_esp.c Sat Nov 26 23:15:28 2011 (r228010)
@@ -918,7 +918,7 @@ esp_output_cb(struct cryptop *crp)
struct ipsecrequest *isr;
struct secasvar *sav;
struct mbuf *m;
- int err, error;
+ int error;
tc = (struct tdb_crypto *) crp->crp_opaque;
IPSEC_ASSERT(tc != NULL, ("null opaque data area!"));
@@ -1000,10 +1000,10 @@ esp_output_cb(struct cryptop *crp)
#endif
/* NB: m is reclaimed by ipsec_process_done. */
- err = ipsec_process_done(m, isr);
+ error = ipsec_process_done(m, isr);
KEY_FREESAV(&sav);
IPSECREQUEST_UNLOCK(isr);
- return err;
+ return error;
bad:
if (sav)
KEY_FREESAV(&sav);
More information about the svn-src-head
mailing list