summaryrefslogtreecommitdiff
path: root/ovsdb
diff options
context:
space:
mode:
authorHarold Lim <haroldl@vmware.com>2013-12-17 10:32:12 -0800
committerBen Pfaff <blp@nicira.com>2013-12-17 13:16:39 -0800
commit428b2eddc9c47d8306252f0fc5218839d2ff017c (patch)
tree2f9ad52cff91369bc8e527d59ab4dcec422b3a88 /ovsdb
parent037821cf99cadc12e0391dc3fc1961499a20c9fd (diff)
downloadopenvswitch-428b2eddc9c47d8306252f0fc5218839d2ff017c.tar.gz
Rename NOT_REACHED to OVS_NOT_REACHED
This allows other libraries to use util.h that has already defined NOT_REACHED. Signed-off-by: Harold Lim <haroldl@vmware.com> Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'ovsdb')
-rw-r--r--ovsdb/condition.c4
-rw-r--r--ovsdb/log.c2
-rw-r--r--ovsdb/mutation.c6
3 files changed, 6 insertions, 6 deletions
diff --git a/ovsdb/condition.c b/ovsdb/condition.c
index 760dd13bc..8e67c8898 100644
--- a/ovsdb/condition.c
+++ b/ovsdb/condition.c
@@ -258,11 +258,11 @@ ovsdb_clause_evaluate(const struct ovsdb_row *row,
case OVSDB_F_LE:
case OVSDB_F_GE:
case OVSDB_F_GT:
- NOT_REACHED();
+ OVS_NOT_REACHED();
}
}
- NOT_REACHED();
+ OVS_NOT_REACHED();
}
bool
diff --git a/ovsdb/log.c b/ovsdb/log.c
index ed72ca408..807b98337 100644
--- a/ovsdb/log.c
+++ b/ovsdb/log.c
@@ -102,7 +102,7 @@ ovsdb_log_open(const char *name, enum ovsdb_log_open_mode open_mode,
flags = O_RDWR | O_CREAT | O_EXCL;
}
} else {
- NOT_REACHED();
+ OVS_NOT_REACHED();
}
fd = open(name, flags, 0666);
if (fd < 0) {
diff --git a/ovsdb/mutation.c b/ovsdb/mutation.c
index 5fd983a4b..967ad157d 100644
--- a/ovsdb/mutation.c
+++ b/ovsdb/mutation.c
@@ -150,7 +150,7 @@ ovsdb_mutation_from_json(const struct ovsdb_table_schema *ts,
break;
default:
- NOT_REACHED();
+ OVS_NOT_REACHED();
}
exit:
@@ -306,7 +306,7 @@ mutate_scalar(const struct ovsdb_type *dst_type, struct ovsdb_datum *dst,
}
}
} else {
- NOT_REACHED();
+ OVS_NOT_REACHED();
}
for (i = 0; i < dst->n; i++) {
@@ -387,7 +387,7 @@ ovsdb_mutation_set_execute(struct ovsdb_row *row,
break;
default:
- NOT_REACHED();
+ OVS_NOT_REACHED();
}
if (error) {
return error;