Skip to content

P
proview
Commit 9f25dc2f authored by ml's avatar ml
Browse files
Options

Changes due to modified co_dbs.h

parent d491ec4a
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
src/exe/rt_ini/src/ini.c
View file @ 9f25dc2f
...@@ -1182,8 +1182,8 @@ ini_CheckVolumeFile ( ...@@ -1182,8 +1182,8 @@ ini_CheckVolumeFile (
if (checkSect(sts, cp, sects, dbs_cVersionVolRef)) if (checkSect(sts, cp, sects, dbs_cVersionVolRef))
readSectVolRef(sts, cp); readSectVolRef(sts, cp);
break; break;
case dbs_eSect_oix: case dbs_eSect_oid:
checkSect(sts, cp, sects, dbs_cVersionOix); checkSect(sts, cp, sects, dbs_cVersionOid);
break; break;
case dbs_eSect_object: case dbs_eSect_object:
checkSect(sts, cp, sects, dbs_cVersionObject); checkSect(sts, cp, sects, dbs_cVersionObject);
...@@ -1203,7 +1203,7 @@ ini_CheckVolumeFile ( ...@@ -1203,7 +1203,7 @@ ini_CheckVolumeFile (
} while (cp->sect.type != dbs_eSect_rbody); } while (cp->sect.type != dbs_eSect_rbody);
reqmask = (1<<dbs_eSect_dir) | (1<<dbs_eSect_volume) | (1<<dbs_eSect_volref) reqmask = (1<<dbs_eSect_dir) | (1<<dbs_eSect_volume) | (1<<dbs_eSect_volref)
| (1<<dbs_eSect_oix) | (1<<dbs_eSect_object) | (1<<dbs_eSect_rbody); | (1<<dbs_eSect_oid) | (1<<dbs_eSect_object) | (1<<dbs_eSect_rbody);
if ((sects & reqmask) != reqmask) { if ((sects & reqmask) != reqmask) {
*sts = INI__SECTORDER; *sts = INI__SECTORDER;
errh_LogError(&cp->log, "Section order"); errh_LogError(&cp->log, "Section order");
...@@ -1267,8 +1267,8 @@ ini_LoadVolume ( ...@@ -1267,8 +1267,8 @@ ini_LoadVolume (
case dbs_eSect_volref: case dbs_eSect_volref:
checkSect(sts, cp, sects, dbs_cVersionVolRef); checkSect(sts, cp, sects, dbs_cVersionVolRef);
break; break;
case dbs_eSect_oix: case dbs_eSect_oid:
checkSect(sts, cp, sects, dbs_cVersionOix); checkSect(sts, cp, sects, dbs_cVersionOid);
break; break;
case dbs_eSect_object: case dbs_eSect_object:
if (checkSect(sts, cp, sects, dbs_cVersionObject)) if (checkSect(sts, cp, sects, dbs_cVersionObject))
...@@ -1290,7 +1290,7 @@ ini_LoadVolume ( ...@@ -1290,7 +1290,7 @@ ini_LoadVolume (
} while (cp->sect.type != dbs_eSect_rbody); } while (cp->sect.type != dbs_eSect_rbody);
reqmask = (1<<dbs_eSect_dir) | (1<<dbs_eSect_volume) | (1<<dbs_eSect_volref) reqmask = (1<<dbs_eSect_dir) | (1<<dbs_eSect_volume) | (1<<dbs_eSect_volref)
| (1<<dbs_eSect_oix) | (1<<dbs_eSect_object) | (1<<dbs_eSect_rbody); | (1<<dbs_eSect_oid) | (1<<dbs_eSect_object) | (1<<dbs_eSect_rbody);
if ((sects & reqmask) != reqmask) { if ((sects & reqmask) != reqmask) {
*sts = INI__SECTORDER; *sts = INI__SECTORDER;
...@@ -1355,8 +1355,8 @@ ini_ReloadVolume ( ...@@ -1355,8 +1355,8 @@ ini_ReloadVolume (
case dbs_eSect_volref: case dbs_eSect_volref:
checkSect(sts, cp, sects, dbs_cVersionVolRef); checkSect(sts, cp, sects, dbs_cVersionVolRef);
break; break;
case dbs_eSect_oix: case dbs_eSect_oid:
checkSect(sts, cp, sects, dbs_cVersionOix); checkSect(sts, cp, sects, dbs_cVersionOid);
break; break;
case dbs_eSect_object: case dbs_eSect_object:
if (checkSect(sts, cp, sects, dbs_cVersionObject)) if (checkSect(sts, cp, sects, dbs_cVersionObject))
...@@ -1378,7 +1378,7 @@ ini_ReloadVolume ( ...@@ -1378,7 +1378,7 @@ ini_ReloadVolume (
} while (cp->sect.type != dbs_eSect_rbody); } while (cp->sect.type != dbs_eSect_rbody);
reqmask = (1<<dbs_eSect_dir) | (1<<dbs_eSect_volume) | (1<<dbs_eSect_volref) reqmask = (1<<dbs_eSect_dir) | (1<<dbs_eSect_volume) | (1<<dbs_eSect_volref)
| (1<<dbs_eSect_oix) | (1<<dbs_eSect_object) | (1<<dbs_eSect_rbody); | (1<<dbs_eSect_oid) | (1<<dbs_eSect_object) | (1<<dbs_eSect_rbody);
if ((sects & reqmask) != reqmask) { if ((sects & reqmask) != reqmask) {
*sts = INI__SECTORDER; *sts = INI__SECTORDER;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7