From: Peter Somogyi Date: Fri, 20 Apr 2007 12:47:52 +0000 (+0200) Subject: Simplified code in ctdb_init_transport. X-Git-Tag: tevent-0.9.20~348^2~2842^2~6 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=933cb2efce9516aad67dfad6aa1de77a0bf8af25;p=thirdparty%2Fsamba.git Simplified code in ctdb_init_transport. (This used to be ctdb commit 9a30e0fcbdde587cb1f3d854b8f1d22da19d9af4) --- diff --git a/ctdb/common/ctdb.c b/ctdb/common/ctdb.c index 34f753a84d8..851be93e3fe 100644 --- a/ctdb/common/ctdb.c +++ b/ctdb/common/ctdb.c @@ -39,25 +39,21 @@ int ctdb_init_transport(struct ctdb_context *ctdb) { int i; int ctdb_tcp_init(struct ctdb_context *ctdb); - int transport_found = 0; #ifdef USE_INFINIBAND int ctdb_ibw_init(struct ctdb_context *ctdb); #endif /* USE_INFINIBAND */ if (strcmp(ctdb->transport, "tcp") == 0) { - transport_found = 1; if (ctdb_tcp_init(ctdb)) return -1; } #ifdef USE_INFINIBAND else if (strcmp(ctdb->transport, "ib") == 0) { - transport_found = 1; if (ctdb_ibw_init(ctdb)) return -1; } #endif /* USE_INFINIBAND */ - - if (!transport_found) { + else { ctdb_set_error(ctdb, "Unknown transport '%s'\n", ctdb->transport); return -1; }