Skip to content

Commit

Permalink
Fix compilation error when configured with --enable-sparse.
Browse files Browse the repository at this point in the history
The below error is seen.

../controller/ovn-controller.c:2305:70: error: Using plain integer as NULL pointer
make[1]: *** [Makefile:2000: controller/ovn-controller.o] Error 1
make[1]: *** Waiting for unfinished jobs....

Fixes: 512b884("Add northd and ovn-controller cluster status reset commands.")
CC: Mark Michelson <mmichels@redhat.com>
Acked-by: Dumitru Ceara <dceara@redhat.com>
Signed-off-by: Numan Siddique <numans@ovn.org>
  • Loading branch information
numansiddique committed Jun 11, 2020
1 parent 512b884 commit 10deb86
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions controller/ovn-controller.c
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ update_sb_db(struct ovsdb_idl *ovs_idl, struct ovsdb_idl *ovnsb_idl,
if (monitor_all_p) {
*monitor_all_p = monitor_all;
}
if (*reset_ovnsb_idl_min_index) {
if (reset_ovnsb_idl_min_index && *reset_ovnsb_idl_min_index) {
VLOG_INFO("Resetting southbound database cluster state");
engine_set_force_recompute(true);
ovsdb_idl_reset_min_index(ovnsb_idl);
Expand Down Expand Up @@ -2302,7 +2302,7 @@ main(int argc, char *argv[])
if (!restart) {
bool done = !ovsdb_idl_has_ever_connected(ovnsb_idl_loop.idl);
while (!done) {
update_sb_db(ovs_idl_loop.idl, ovnsb_idl_loop.idl, NULL, false);
update_sb_db(ovs_idl_loop.idl, ovnsb_idl_loop.idl, NULL, NULL);
update_ssl_config(ovsrec_ssl_table_get(ovs_idl_loop.idl));

struct ovsdb_idl_txn *ovs_idl_txn
Expand Down

0 comments on commit 10deb86

Please sign in to comment.