From 5bee6e2638989aff14429c5a85fa7cef196f2106 Mon Sep 17 00:00:00 2001 From: Justin Pettit Date: Fri, 1 Jul 2011 14:13:56 -0700 Subject: [PATCH] ofproto: Rename "private.h" to "ofproto->provider.h". To be more consistent with other providers, rename "private.h" to "ofproto-provider.h". --- PORTING | 6 +++--- ofproto/automake.mk | 4 ++-- ofproto/connmgr.c | 2 +- ofproto/fail-open.c | 2 +- ofproto/in-band.c | 2 +- ofproto/ofproto-dpif.c | 2 +- ofproto/{private.h => ofproto-provider.h} | 6 +++--- ofproto/ofproto.c | 10 +++++----- 8 files changed, 17 insertions(+), 17 deletions(-) rename ofproto/{private.h => ofproto-provider.h} (99%) diff --git a/PORTING b/PORTING index 3dd0bfc5..1ac1c636 100644 --- a/PORTING +++ b/PORTING @@ -160,9 +160,9 @@ ofproto Providers An "ofproto provider" is what ofproto uses to directly monitor and control an OpenFlow-capable switch. struct ofproto_class, in -ofproto/private.h, defines the interfaces to implement an ofproto -provider for new hardware or software. That structure contains many -function pointers, each of which has a comment that is meant to +ofproto/ofproto-provider.h, defines the interfaces to implement an +ofproto provider for new hardware or software. That structure contains +many function pointers, each of which has a comment that is meant to describe its behavior in detail. If the requirements are unclear, please report this as a bug. diff --git a/ofproto/automake.mk b/ofproto/automake.mk index 9ce40ab3..df83aef0 100644 --- a/ofproto/automake.mk +++ b/ofproto/automake.mk @@ -23,10 +23,10 @@ ofproto_libofproto_a_SOURCES = \ ofproto/ofproto-dpif.c \ ofproto/ofproto-dpif-sflow.c \ ofproto/ofproto-dpif-sflow.h \ + ofproto/ofproto-provider.h \ ofproto/pktbuf.c \ ofproto/pktbuf.h \ ofproto/pinsched.c \ - ofproto/pinsched.h \ - ofproto/private.h + ofproto/pinsched.h EXTRA_DIST += ofproto/ofproto-unixctl.man diff --git a/ofproto/connmgr.c b/ofproto/connmgr.c index 7776c889..44e1b284 100644 --- a/ofproto/connmgr.c +++ b/ofproto/connmgr.c @@ -27,10 +27,10 @@ #include "odp-util.h" #include "ofp-util.h" #include "ofpbuf.h" +#include "ofproto-provider.h" #include "pinsched.h" #include "poll-loop.h" #include "pktbuf.h" -#include "private.h" #include "rconn.h" #include "shash.h" #include "timeval.h" diff --git a/ofproto/fail-open.c b/ofproto/fail-open.c index 197e5183..541bb054 100644 --- a/ofproto/fail-open.c +++ b/ofproto/fail-open.c @@ -26,9 +26,9 @@ #include "ofp-util.h" #include "ofpbuf.h" #include "ofproto.h" +#include "ofproto-provider.h" #include "pktbuf.h" #include "poll-loop.h" -#include "private.h" #include "rconn.h" #include "timeval.h" #include "vconn.h" diff --git a/ofproto/in-band.c b/ofproto/in-band.c index 14cfa040..ae1f1b13 100644 --- a/ofproto/in-band.c +++ b/ofproto/in-band.c @@ -32,10 +32,10 @@ #include "odp-util.h" #include "ofproto.h" #include "ofpbuf.h" +#include "ofproto-provider.h" #include "openflow/openflow.h" #include "packets.h" #include "poll-loop.h" -#include "private.h" #include "timeval.h" #include "vlog.h" diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c index 1e77cda2..72643554 100644 --- a/ofproto/ofproto-dpif.c +++ b/ofproto/ofproto-dpif.c @@ -16,7 +16,7 @@ #include -#include "ofproto/private.h" +#include "ofproto/ofproto-provider.h" #include diff --git a/ofproto/private.h b/ofproto/ofproto-provider.h similarity index 99% rename from ofproto/private.h rename to ofproto/ofproto-provider.h index a5bd17e0..62fb0353 100644 --- a/ofproto/private.h +++ b/ofproto/ofproto-provider.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef OFPROTO_PRIVATE_H -#define OFPROTO_PRIVATE_H 1 +#ifndef OFPROTO_OFPROTO_PROVIDER_H +#define OFPROTO_OFPROTO_PROVIDER_H 1 /* Definitions for use within ofproto. */ @@ -923,4 +923,4 @@ void ofproto_add_flow(struct ofproto *, const struct cls_rule *, bool ofproto_delete_flow(struct ofproto *, const struct cls_rule *); void ofproto_flush_flows(struct ofproto *); -#endif /* ofproto/private.h */ +#endif /* ofproto/ofproto-provider.h */ diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c index ac243cf0..201488de 100644 --- a/ofproto/ofproto.c +++ b/ofproto/ofproto.c @@ -33,13 +33,13 @@ #include "ofp-print.h" #include "ofp-util.h" #include "ofpbuf.h" +#include "ofproto-provider.h" #include "openflow/nicira-ext.h" #include "openflow/openflow.h" #include "packets.h" #include "pinsched.h" #include "pktbuf.h" #include "poll-loop.h" -#include "private.h" #include "shash.h" #include "sset.h" #include "timeval.h" @@ -1369,8 +1369,8 @@ ofproto_rule_destroy__(struct rule *rule) /* This function allows an ofproto implementation to destroy any rules that * remain when its ->destruct() function is called. The caller must have * already uninitialized any derived members of 'rule' (step 5 described in the - * large comment in ofproto/private.h titled "Life Cycle"). This function - * implements steps 6 and 7. + * large comment in ofproto/ofproto-provider.h titled "Life Cycle"). + * This function implements steps 6 and 7. * * This function should only be called from an ofproto implementation's * ->destruct() function. It is not suitable elsewhere. */ @@ -2800,8 +2800,8 @@ ofoperation_destroy(struct ofoperation *op) * If 'op' is a "delete flow" operation, 'error' must be 0. That is, flow * deletions are not allowed to fail. * - * Please see the large comment in ofproto/private.h titled "Asynchronous - * Operation Support" for more information. */ + * Please see the large comment in ofproto/ofproto-provider.h titled + * "Asynchronous Operation Support" for more information. */ void ofoperation_complete(struct ofoperation *op, int error) { -- 2.30.2