X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fgetvserverbyctx.c;fp=lib%2Fgetvserverbyctx.c;h=8487835d9d1da5c1c869a42a75a0308e39fae45c;hb=ec4370f7ebd7fb0ce7f002f5bf2c74f03acd3ec1;hp=9896ae85f4cc644b6c1946d7b4f74fe9b8579dbf;hpb=9234e6a7cb48373edec38284ba54a819037b79b2;p=util-vserver.git diff --git a/lib/getvserverbyctx.c b/lib/getvserverbyctx.c index 9896ae8..8487835 100644 --- a/lib/getvserverbyctx.c +++ b/lib/getvserverbyctx.c @@ -1,4 +1,4 @@ -// $Id: getvserverbyctx.c,v 1.6 2004/03/11 04:40:29 ensc Exp $ --*- c -*-- +// $Id: getvserverbyctx.c 2444 2007-01-03 11:55:04Z dhozac $ --*- c -*-- // Copyright (C) 2003 Enrico Scholz // @@ -31,11 +31,24 @@ #include "getvserverbyctx-compat.hc" #include "getvserverbyctx-v13.hc" + +char * +vc_getVserverByCtx_Internal(xid_t ctx, /*@null@*/vcCfgStyle *style, + /*@null@*/char const *revdir, + bool validate_result) +{ + char *ret; + if (vc_isSupported(vcFEATURE_MIGRATE)) { + ret = vc_getVserverByCtx_v13(ctx, style, revdir, validate_result); + if (ret) + return ret; + } + return vc_getVserverByCtx_compat(ctx, style, revdir, validate_result); +} + char * vc_getVserverByCtx(xid_t ctx, vcCfgStyle *style, char const *revdir) { - if (vc_isSupported(vcFEATURE_MIGRATE)) - return vc_getVserverByCtx_v13(ctx, style, revdir); - else - return vc_getVserverByCtx_compat(ctx, style, revdir); + return vc_getVserverByCtx_Internal(ctx, style, revdir, true); + }