Apply patch: ncpfs-hg-commit-431.patch
This commit is contained in:
@@ -230,7 +230,7 @@ NWDSCCODE NWDSGetDSVerInfo(
|
||||
switch (version) {
|
||||
case 0x00000009:
|
||||
{
|
||||
char asciiName[MAX_TREE_NAME_CHARS + 1];
|
||||
unsigned char asciiName[MAX_TREE_NAME_CHARS + 1];
|
||||
nuint32 asciiNameLen;
|
||||
|
||||
dserr = NWDSBufGetLE32(&buf, &asciiNameLen);
|
||||
|
||||
@@ -69,7 +69,7 @@ NWDSCCODE __NWDSOpenStream(
|
||||
const NWDSChar* attrName,
|
||||
nflag32 flags,
|
||||
NWCONN_HANDLE* rconn,
|
||||
char fh[6],
|
||||
unsigned char fh[6],
|
||||
ncp_off64_t* size) {
|
||||
NWDSCCODE err;
|
||||
char rq_b[DEFAULT_MESSAGE_LEN];
|
||||
|
||||
@@ -339,12 +339,12 @@ NWDSCCODE NWDSGetPartitionExtInfoPtr(
|
||||
}
|
||||
fields = partitions->dsiFlags;
|
||||
if (fields & DSP_OUTPUT_FIELDS) {
|
||||
*infoPtr = partitions->curPos;
|
||||
*infoPtr = (char*)partitions->curPos;
|
||||
dserr = NWDSBufGetLE32(partitions, &fields);
|
||||
if (dserr)
|
||||
return dserr;
|
||||
} else {
|
||||
*infoPtr = partitions->curPos - 4;
|
||||
*infoPtr = (char*)partitions->curPos - 4;
|
||||
DSET_LH(partitions->curPos - 4, 0, fields);
|
||||
}
|
||||
if (fields & DSP_PARTITION_ID)
|
||||
@@ -372,7 +372,7 @@ NWDSCCODE NWDSGetPartitionExtInfoPtr(
|
||||
return NWE_PARAM_INVALID;
|
||||
if (partitions->curPos > partitions->dataend)
|
||||
return ERR_BUFFER_EMPTY;
|
||||
*infoPtrEnd = partitions->curPos;
|
||||
*infoPtrEnd = (char*)partitions->curPos;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -166,7 +166,7 @@ static NWDSCCODE __NWDSSearchV4(
|
||||
struct search_referrals {
|
||||
struct search_referrals* next;
|
||||
nuint32 referrals;
|
||||
char data[0];
|
||||
unsigned char data[0];
|
||||
};
|
||||
|
||||
struct SearchIH {
|
||||
|
||||
@@ -221,10 +221,10 @@ static NWDSCCODE __NWDSGenerateObjectKeyPairStep3(
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void __NWDSHashPasswordUpper(const nuint8* objectPassword,
|
||||
NWObjectID pseudoID,
|
||||
size_t pwdLen,
|
||||
nuint8 pwdHash[16]
|
||||
static void __NWDSHashPasswordUpper(const char* objectPassword,
|
||||
NWObjectID pseudoID,
|
||||
size_t pwdLen,
|
||||
nuint8 pwdHash[16]
|
||||
) {
|
||||
nuint8 newPwd[pwdLen + 1];
|
||||
size_t i;
|
||||
@@ -238,10 +238,10 @@ static void __NWDSHashPasswordUpper(const nuint8* objectPassword,
|
||||
shuffle(tmpID, newPwd, pwdLen, pwdHash);
|
||||
}
|
||||
|
||||
static void __NWDSHashPassword(const nuint8* objectPassword,
|
||||
NWObjectID pseudoID,
|
||||
size_t pwdLen,
|
||||
nuint8 pwdHash[16]
|
||||
static void __NWDSHashPassword(const char* objectPassword,
|
||||
NWObjectID pseudoID,
|
||||
size_t pwdLen,
|
||||
nuint8 pwdHash[16]
|
||||
) {
|
||||
nuint8 tmpID[4];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user