Merge ipx_pcb.c:1.44, spx_usrreq.c:1.71 from HEAD to RELENG_6:

Clean up and style(9) SPX code prior to significant functional changes
  being committed:

  - Wrap comments more evenly on right border.
  - Clean up braces.

  Also, along similar lines:

  - Assert some pointers are non-NULL before dereferencing them.
  - Remove one assertion that looks, on face value, poor.
This commit is contained in:
rwatson 2006-06-08 23:20:37 +00:00
parent 42cd5f7b8b
commit 12b89b7e1c
2 changed files with 262 additions and 220 deletions

View File

@ -1,8 +1,9 @@
/*-
* Copyright (c) 2004-2005 Robert N. M. Watson
* Copyright (c) 1995, Mike Mitchell
* Copyright (c) 1984, 1985, 1986, 1987, 1993
* The Regents of the University of California. All rights reserved.
* The Regents of the University of California.
* Copyright (c) 1995, Mike Mitchell
* Copyright (c) 2004-2006 Robert N. M. Watson
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@ -63,6 +64,7 @@ ipx_pcballoc(so, head, td)
{
register struct ipxpcb *ipxp;
KASSERT(so->so_pcb == NULL, ("ipx_pcballoc: so_pcb != NULL"));
IPX_LIST_LOCK_ASSERT();
MALLOC(ipxp, struct ipxpcb *, sizeof *ipxp, M_PCB, M_NOWAIT | M_ZERO);

File diff suppressed because it is too large Load Diff