svn commit: r196883 - head/sys/netipsec

[Bjoern A. Zeeb]

On Sun, 6 Sep 2009, Pawel Jakub Dawidek wrote:

> Author: pjd
> Date: Sun Sep  6 07:32:16 2009
> New Revision: 196883
> URL: http://svn.freebsd.org/changeset/base/196883
>
> Log:
>  Improve code a bit by eliminating goto and having one unlock per lock.

This does not coompile anymore:

HEAD.svn/sys/netipsec/key.c: In function 'key_checkrequest':
HEAD.svn/sys/netipsec/key.c: warning: 'state_valid' may be used uninitialized in this function
HEAD.svn/sys/netipsec/key.c: note: 'state_valid' was declared here






> Modified:
>  head/sys/netipsec/key.c
>
> Modified: head/sys/netipsec/key.c
> ==============================================================================
> --- head/sys/netipsec/key.c	Sun Sep  6 07:30:21 2009	(r196882)
> +++ head/sys/netipsec/key.c	Sun Sep  6 07:32:16 2009	(r196883)
> @@ -918,15 +918,14 @@ key_allocsa_policy(const struct secasind
> 				state_valid = saorder_state_valid_prefer_new;
> 				arraysize = N(saorder_state_valid_prefer_new);
> 			}
> -			SAHTREE_UNLOCK();
> -			goto found;
> +			break;
> 		}
> 	}
> 	SAHTREE_UNLOCK();
>
> -	return NULL;
> +	if (sah == NULL)
> +		return NULL;
>
> -    found:
> 	/* search valid state */
> 	for (stateidx = 0; stateidx < arraysize; stateidx++) {
> 		sav = key_do_allocsa_policy(sah, state_valid[stateidx]);
>

-- 
Bjoern A. Zeeb           What was I talking about and who are you again?