git://git.onelab.eu
/
util-vserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 0.30.214.
[util-vserver.git]
/
lib
/
getvserverbyctx-compat.hc
diff --git
a/lib/getvserverbyctx-compat.hc
b/lib/getvserverbyctx-compat.hc
index
4c63738
..
ac6076b
100644
(file)
--- a/
lib/getvserverbyctx-compat.hc
+++ b/
lib/getvserverbyctx-compat.hc
@@
-1,4
+1,4
@@
-// $Id: getvserverbyctx-compat.hc 2
182 2005-10-25 16:20:07Z ens
c $ --*- c -*--
+// $Id: getvserverbyctx-compat.hc 2
596 2007-08-25 16:56:12Z dhoza
c $ --*- c -*--
// Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
//
// Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
//
@@
-48,7
+48,7
@@
handleLegacy(xid_t xid)
if (l<=4 || strcmp(name+l-4, ".ctx")!=0) continue;
name[l-4] = '\0';
if (l<=4 || strcmp(name+l-4, ".ctx")!=0) continue;
name[l-4] = '\0';
- cur_xid = vc_getVserverCtx(name, vcCFG_LEGACY, false, 0);
+ cur_xid = vc_getVserverCtx(name, vcCFG_LEGACY, false, 0
, vcCTX_XID
);
if (cur_xid!=xid) continue;
result = strdup(name);
if (cur_xid!=xid) continue;
result = strdup(name);
@@
-96,7
+96,7
@@
vc_getVserverByCtx_compat(xid_t ctx, vcCfgStyle *style, char const *revdir,
// check if expected ctx == actual ctx (but only when this check is
// request)
if (validate_result &&
// check if expected ctx == actual ctx (but only when this check is
// request)
if (validate_result &&
- vc_getVserverCtx(path, vcCFG_RECENT_FULL, false, 0)!=ctx) return 0;
+ vc_getVserverCtx(path, vcCFG_RECENT_FULL, false, 0
, vcCTX_XID
)!=ctx) return 0;
if (style) *style = vcCFG_RECENT_FULL;
return strdup(path);
if (style) *style = vcCFG_RECENT_FULL;
return strdup(path);