diff options
| author | des <des@FreeBSD.org> | 2008-10-23 20:26:15 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2008-10-23 20:26:15 +0000 |
| commit | a1e1ad22e07d384a9609e60cdf00daf7cac902cf (patch) | |
| tree | 8c9f9efa0a9f52794e2ce1fe47128f50d30f8c28 /sys/opencrypto | |
| parent | 0b81365bc66eb70b9d9b1466012b41f8ccdec19a (diff) | |
| download | FreeBSD-src-a1e1ad22e07d384a9609e60cdf00daf7cac902cf.zip FreeBSD-src-a1e1ad22e07d384a9609e60cdf00daf7cac902cf.tar.gz | |
Fix a number of style issues in the MALLOC / FREE commit. I've tried to
be careful not to fix anything that was already broken; the NFSv4 code is
particularly bad in this respect.
Diffstat (limited to 'sys/opencrypto')
| -rw-r--r-- | sys/opencrypto/cryptodev.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/opencrypto/cryptodev.c b/sys/opencrypto/cryptodev.c index ad314fb..73280cc 100644 --- a/sys/opencrypto/cryptodev.c +++ b/sys/opencrypto/cryptodev.c @@ -267,7 +267,8 @@ cryptof_ioctl( goto bail; } - crie.cri_key = malloc( crie.cri_klen / 8, M_XDATA, M_WAITOK); + crie.cri_key = malloc(crie.cri_klen / 8, + M_XDATA, M_WAITOK); if ((error = copyin(sop->key, crie.cri_key, crie.cri_klen / 8))) goto bail; @@ -284,7 +285,8 @@ cryptof_ioctl( } if (cria.cri_klen) { - cria.cri_key = malloc( cria.cri_klen / 8, M_XDATA, M_WAITOK); + cria.cri_key = malloc(cria.cri_klen / 8, + M_XDATA, M_WAITOK); if ((error = copyin(sop->mackey, cria.cri_key, cria.cri_klen / 8))) goto bail; @@ -776,11 +778,9 @@ csecreate(struct fcrypt *fcr, u_int64_t sid, caddr_t key, u_int64_t keylen, #ifdef INVARIANTS /* NB: required when mtx_init is built with INVARIANTS */ - cse = malloc(sizeof(struct csession), - M_XDATA, M_NOWAIT | M_ZERO); + cse = malloc(sizeof(struct csession), M_XDATA, M_NOWAIT | M_ZERO); #else - cse = malloc(sizeof(struct csession), - M_XDATA, M_NOWAIT); + cse = malloc(sizeof(struct csession), M_XDATA, M_NOWAIT); #endif if (cse == NULL) return NULL; @@ -840,7 +840,7 @@ cryptoioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread switch (cmd) { case CRIOGET: - fcr = malloc( sizeof(struct fcrypt), M_XDATA, M_WAITOK); + fcr = malloc(sizeof(struct fcrypt), M_XDATA, M_WAITOK); TAILQ_INIT(&fcr->csessions); fcr->sesn = 0; |
