git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Setting tag sliver-openvswitch-1.10.90-3
[sliver-openvswitch.git]
/
lib
/
hmap.c
diff --git
a/lib/hmap.c
b/lib/hmap.c
index
5862b62
..
f15e72c
100644
(file)
--- a/
lib/hmap.c
+++ b/
lib/hmap.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009, 2010, 2012
Nicira Networks
.
+ * Copyright (c) 2008, 2009, 2010, 2012
, 2013 Nicira, Inc
.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-16,7
+16,6
@@
#include <config.h>
#include "hmap.h"
#include <config.h>
#include "hmap.h"
-#include <assert.h>
#include <stdint.h>
#include <string.h>
#include "coverage.h"
#include <stdint.h>
#include <string.h>
#include "coverage.h"
@@
-91,8
+90,7
@@
resize(struct hmap *hmap, size_t new_mask)
struct hmap tmp;
size_t i;
struct hmap tmp;
size_t i;
- assert(!(new_mask & (new_mask + 1)));
- assert(new_mask != SIZE_MAX);
+ ovs_assert(is_pow2(new_mask + 1));
hmap_init(&tmp);
if (new_mask) {
hmap_init(&tmp);
if (new_mask) {