diff options
author | Ben Pfaff <blp@nicira.com> | 2010-03-12 10:27:33 -0800 |
---|---|---|
committer | Ben Pfaff <blp@nicira.com> | 2010-03-17 14:24:55 -0700 |
commit | 80af01eda87eaaf16369642d2733e561b3d56b71 (patch) | |
tree | b63a855a28257fe1abe4b1187e4ecc3413dc3304 /lib/ovsdb-error.c | |
parent | b405dcfb4ee1d105ffcf3931873fb13121375aa8 (diff) | |
download | openvswitch-80af01eda87eaaf16369642d2733e561b3d56b71.tar.gz |
New function ovsdb_error_assert() for verifying that no error occurred.
Diffstat (limited to 'lib/ovsdb-error.c')
-rw-r--r-- | lib/ovsdb-error.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/lib/ovsdb-error.c b/lib/ovsdb-error.c index c0eddf280..c9221493d 100644 --- a/lib/ovsdb-error.c +++ b/lib/ovsdb-error.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2009 Nicira Networks +/* Copyright (c) 2009, 2010 Nicira Networks * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,6 +23,10 @@ #include "dynamic-string.h" #include "json.h" #include "util.h" +#include "vlog.h" + +#define THIS_MODULE VLM_ovsdb_error +#include "vlog.h" struct ovsdb_error { const char *tag; /* String for "error" member. */ @@ -219,3 +223,19 @@ ovsdb_error_get_tag(const struct ovsdb_error *error) { return error->tag; } + +/* If 'error' is nonnull, logs it as an error and frees it. To be used in + * situations where an error should never occur, but an 'ovsdb_error *' gets + * passed back anyhow. */ +void +ovsdb_error_assert(struct ovsdb_error *error) +{ + if (error) { + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1); + char *s = ovsdb_error_to_string(error); + VLOG_ERR_RL(&rl, "unexpected ovsdb error: %s", s); + free(s); + ovsdb_error_destroy(error); + } +} + |