diff options
| author | Thomas Graf <tgraf@noironetworks.com> | 2014-12-15 14:10:38 +0100 |
|---|---|---|
| committer | Thomas Graf <tgraf@noironetworks.com> | 2014-12-15 14:14:47 +0100 |
| commit | cab5044987845e66dbe030eb1384d58cc5a66fc9 (patch) | |
| tree | e5cdae4dc1e96f8f67c258f3db5ad8cdf729f415 /ovsdb/ovsdb-server.c | |
| parent | 9a8d2f8c49c28ddc77be7011748eef17d949fafe (diff) | |
| download | openvswitch-cab5044987845e66dbe030eb1384d58cc5a66fc9.tar.gz | |
lib: Move compiler.h to <openvswitch/compiler.h>
The following macros are renamed to avoid conflicts with other headers:
* WARN_UNUSED_RESULT to OVS_WARN_UNUSED_RESULT
* PRINTF_FORMAT to OVS_PRINTF_FORMAT
* NO_RETURN to OVS_NO_RETURN
Signed-off-by: Thomas Graf <tgraf@noironetworks.com>
Acked-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'ovsdb/ovsdb-server.c')
| -rw-r--r-- | ovsdb/ovsdb-server.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c index 6219110b8..faa774127 100644 --- a/ovsdb/ovsdb-server.c +++ b/ovsdb/ovsdb-server.c @@ -97,7 +97,7 @@ static void close_db(struct db *db); static void parse_options(int *argc, char **argvp[], struct sset *remotes, char **unixctl_pathp, char **run_command); -NO_RETURN static void usage(void); +OVS_NO_RETURN static void usage(void); static char *reconfigure_remotes(struct ovsdb_jsonrpc_server *, const struct shash *all_dbs, @@ -428,7 +428,7 @@ find_db(const struct shash *all_dbs, const char *db_name) return NULL; } -static char * WARN_UNUSED_RESULT +static char * OVS_WARN_UNUSED_RESULT parse_db_column__(const struct shash *all_dbs, const char *name_, char *name, const struct db **dbp, @@ -482,7 +482,7 @@ parse_db_column__(const struct shash *all_dbs, /* Returns NULL if successful, otherwise a malloc()'d string describing the * error. */ -static char * WARN_UNUSED_RESULT +static char * OVS_WARN_UNUSED_RESULT parse_db_column(const struct shash *all_dbs, const char *name_, const struct db **dbp, @@ -498,7 +498,7 @@ parse_db_column(const struct shash *all_dbs, /* Returns NULL if successful, otherwise a malloc()'d string describing the * error. */ -static char * WARN_UNUSED_RESULT +static char * OVS_WARN_UNUSED_RESULT parse_db_string_column(const struct shash *all_dbs, const char *name, const struct db **dbp, |