← Back to team overview

hipl-core team mailing list archive

Re: [Branch ~hipl-core/hipl/trunk] Rev 4930: Indentation and style cleanups.

 

On Mon, Sep 13, 2010 at 02:04:25PM +0000, noreply@xxxxxxxxxxxxx wrote:
> Merge authors:
>   Christof Mroz (christof-mroz)
> ------------------------------------------------------------
> revno: 4930 [merge]
> committer: Christof Mroz <christof.mroz@xxxxxxxxxxxxxx>
> branch nick: trunk
> timestamp: Mon 2010-09-13 16:03:31 +0200
> message:
>   Indentation and style cleanups.

Umm, no...

> --- firewall/firewall.c	2010-09-09 01:39:39 +0000
> +++ firewall/firewall.c	2010-09-09 01:45:27 +0000
> @@ -2043,11 +2040,11 @@
>              return 0;
>          case ':':         /* option without operand */
>              printf("Option -%c requires an operand\n", optopt);
> -            errflg++;
> +            errflg = 1;
>              break;
>          case '?':
>              printf("Unrecognized option: -%c\n", optopt);
> -            errflg++;
> +            errflg = 1;

This is correct - why?

It may even be correct, but nobody can tell from the commit
message, one has to inspect the code.

> @@ -2173,7 +2169,8 @@
>          // get handle with queued packet and process
>          /* @todo: using HIPD_SELECT blocks hipfw with R1 */
>          if ((err = select((highest_descriptor + 1), &read_fdset,
> -                       NULL, NULL, &timeout)) < 0) {
> +                          NULL, NULL, &timeout)) < 0)
> +        {

Why did you change the brace placement style here?

What you do there is not K&R and deviates from all other if
statements in HIPL.

Diego



References