[ovs-dev] [ovs-assert 3/4] Remove useless use of <assert.h>.

Ethan Jackson ethan at nicira.com
Tue Jan 15 19:23:51 UTC 2013


Acked-by: Ethan Jackson <ethan at nicira.com>

On Wed, Nov 7, 2012 at 10:48 AM, Ben Pfaff <blp at nicira.com> wrote:
> These files #included <assert.h> but didn't ever use assert.
>
> Signed-off-by: Ben Pfaff <blp at nicira.com>
> ---
>  lib/ofp-util.h           |    1 -
>  lib/packets.c            |    1 -
>  lib/sat-math.h           |    1 -
>  lib/stream-fd.c          |    1 -
>  lib/stream-unix.c        |    1 -
>  lib/tag.h                |    3 +--
>  lib/vconn-stream.c       |    3 +--
>  ovsdb/ovsdb-client.c     |    1 -
>  ovsdb/ovsdb-server.c     |    1 -
>  vswitchd/ovs-brcompatd.c |    1 -
>  vswitchd/ovs-vswitchd.c  |    1 -
>  11 files changed, 2 insertions(+), 13 deletions(-)
>
> diff --git a/lib/ofp-util.h b/lib/ofp-util.h
> index 4bd5a00..76367a7 100644
> --- a/lib/ofp-util.h
> +++ b/lib/ofp-util.h
> @@ -17,7 +17,6 @@
>  #ifndef OFP_UTIL_H
>  #define OFP_UTIL_H 1
>
> -#include <assert.h>
>  #include <stdbool.h>
>  #include <stddef.h>
>  #include <stdint.h>
> diff --git a/lib/packets.c b/lib/packets.c
> index 16f4fe6..ab4e4f2 100644
> --- a/lib/packets.c
> +++ b/lib/packets.c
> @@ -16,7 +16,6 @@
>
>  #include <config.h>
>  #include "packets.h"
> -#include <assert.h>
>  #include <arpa/inet.h>
>  #include <sys/socket.h>
>  #include <netinet/in.h>
> diff --git a/lib/sat-math.h b/lib/sat-math.h
> index f4287fc..3d1c50b 100644
> --- a/lib/sat-math.h
> +++ b/lib/sat-math.h
> @@ -17,7 +17,6 @@
>  #ifndef SAT_MATH_H
>  #define SAT_MATH_H 1
>
> -#include <assert.h>
>  #include <limits.h>
>
>  /* Saturating addition: overflow yields UINT_MAX. */
> diff --git a/lib/stream-fd.c b/lib/stream-fd.c
> index f7e1234..1b16f3e 100644
> --- a/lib/stream-fd.c
> +++ b/lib/stream-fd.c
> @@ -16,7 +16,6 @@
>
>  #include <config.h>
>  #include "stream-fd.h"
> -#include <assert.h>
>  #include <errno.h>
>  #include <poll.h>
>  #include <stdlib.h>
> diff --git a/lib/stream-unix.c b/lib/stream-unix.c
> index 4feefdf..0eaf161 100644
> --- a/lib/stream-unix.c
> +++ b/lib/stream-unix.c
> @@ -16,7 +16,6 @@
>
>  #include <config.h>
>  #include "stream.h"
> -#include <assert.h>
>  #include <errno.h>
>  #include <inttypes.h>
>  #include <netdb.h>
> diff --git a/lib/tag.h b/lib/tag.h
> index 2050de0..9d6b4aa 100644
> --- a/lib/tag.h
> +++ b/lib/tag.h
> @@ -1,5 +1,5 @@
>  /*
> - * Copyright (c) 2008, 2011 Nicira, Inc.
> + * Copyright (c) 2008, 2011, 2012 Nicira, Inc.
>   *
>   * Licensed under the Apache License, Version 2.0 (the "License");
>   * you may not use this file except in compliance with the License.
> @@ -17,7 +17,6 @@
>  #ifndef TAG_H
>  #define TAG_H 1
>
> -#include <assert.h>
>  #include <stdbool.h>
>  #include <stdint.h>
>  #include "util.h"
> diff --git a/lib/vconn-stream.c b/lib/vconn-stream.c
> index 38ce374..613b92c 100644
> --- a/lib/vconn-stream.c
> +++ b/lib/vconn-stream.c
> @@ -1,5 +1,5 @@
>  /*
> - * Copyright (c) 2008, 2009, 2010, 2011 Nicira, Inc.
> + * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc.
>   *
>   * Licensed under the Apache License, Version 2.0 (the "License");
>   * you may not use this file except in compliance with the License.
> @@ -15,7 +15,6 @@
>   */
>
>  #include <config.h>
> -#include <assert.h>
>  #include <errno.h>
>  #include <poll.h>
>  #include <stdlib.h>
> diff --git a/ovsdb/ovsdb-client.c b/ovsdb/ovsdb-client.c
> index d5d2189..37bd1aa 100644
> --- a/ovsdb/ovsdb-client.c
> +++ b/ovsdb/ovsdb-client.c
> @@ -16,7 +16,6 @@
>
>  #include <config.h>
>
> -#include <assert.h>
>  #include <ctype.h>
>  #include <errno.h>
>  #include <getopt.h>
> diff --git a/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c
> index 69548c2..e903405 100644
> --- a/ovsdb/ovsdb-server.c
> +++ b/ovsdb/ovsdb-server.c
> @@ -15,7 +15,6 @@
>
>  #include <config.h>
>
> -#include <assert.h>
>  #include <errno.h>
>  #include <getopt.h>
>  #include <signal.h>
> diff --git a/vswitchd/ovs-brcompatd.c b/vswitchd/ovs-brcompatd.c
> index df9332f..059b781 100644
> --- a/vswitchd/ovs-brcompatd.c
> +++ b/vswitchd/ovs-brcompatd.c
> @@ -16,7 +16,6 @@
>  #include <config.h>
>
>  #include <asm/param.h>
> -#include <assert.h>
>  #include <errno.h>
>  #include <getopt.h>
>  #include <inttypes.h>
> diff --git a/vswitchd/ovs-vswitchd.c b/vswitchd/ovs-vswitchd.c
> index 84e5ad1..9736b79 100644
> --- a/vswitchd/ovs-vswitchd.c
> +++ b/vswitchd/ovs-vswitchd.c
> @@ -15,7 +15,6 @@
>
>  #include <config.h>
>
> -#include <assert.h>
>  #include <errno.h>
>  #include <getopt.h>
>  #include <limits.h>
> --
> 1.7.2.5
>
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev



More information about the dev mailing list