Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix morkEnv::OidAsHex() to print a scope < 0x80 as

Browse Source 
a plain text byte instead of ^hex hex when the character
is a name byte


git-svn-id: svn://10.0.0.236/trunk@28578 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
davidmc%netscape.com 1999-04-21 23:51:22 +00:00
parent 7571020113
commit 502113bf3e
2 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mozilla/db/mork/src/morkEnv.cpp
View File

@ -178,12 +178,24 @@ morkEnv::OidAsHex(void* outBuf, const mdbOid& inOid)
// sprintf(buf, "%lX:^%lX", (long) inOid.mOid_Id, (long) inOid.mOid_Scope);
{
mork_u1* p = (mork_u1*) outBuf;
mork_size idSize = this->TokenAsHex(p, inOid.mOid_Id);
p += idSize;
mork_size outSize = this->TokenAsHex(p, inOid.mOid_Id);
p += outSize;
*p++ = ':';
*p++ = '^';
mork_size scopeSize = this->TokenAsHex(p, inOid.mOid_Scope);
return idSize + scopeSize + 2;
mork_scope scope = inOid.mOid_Scope;
if ( scope < 0x80 && morkCh_IsName((mork_ch) scope) )
{
*p++ = (mork_u1) scope;
*p = 0; // null termination
outSize += 2;
}
else
{
*p++ = '^';
mork_size scopeSize = this->TokenAsHex(p, scope);
outSize += scopeSize + 2;
}
return outSize;
}

22
mozilla/mailnews/db/mork/src/morkEnv.cpp
View File

@ -178,12 +178,24 @@ morkEnv::OidAsHex(void* outBuf, const mdbOid& inOid)
// sprintf(buf, "%lX:^%lX", (long) inOid.mOid_Id, (long) inOid.mOid_Scope);
{
mork_u1* p = (mork_u1*) outBuf;
mork_size idSize = this->TokenAsHex(p, inOid.mOid_Id);
p += idSize;
mork_size outSize = this->TokenAsHex(p, inOid.mOid_Id);
p += outSize;
*p++ = ':';
*p++ = '^';
mork_size scopeSize = this->TokenAsHex(p, inOid.mOid_Scope);
return idSize + scopeSize + 2;
mork_scope scope = inOid.mOid_Scope;
if ( scope < 0x80 && morkCh_IsName((mork_ch) scope) )
{
*p++ = (mork_u1) scope;
*p = 0; // null termination
outSize += 2;
}
else
{
*p++ = '^';
mork_size scopeSize = this->TokenAsHex(p, scope);
outSize += scopeSize + 2;
}
return outSize;
}