зеркало из https://github.com/mozilla/pjs.git
BugZilla: 45623
This commit is contained in:
Родитель
11675cf4d1
Коммит
42c7a98b9b
|
@ -348,7 +348,7 @@ PR_IMPLEMENT(PRInt32) PR_EmulateSendFile(
|
||||||
PRFileInfo info;
|
PRFileInfo info;
|
||||||
PRIOVec iov[3];
|
PRIOVec iov[3];
|
||||||
PRFileMap *mapHandle = NULL;
|
PRFileMap *mapHandle = NULL;
|
||||||
void *addr;
|
void *addr = (void*)0; /* initialized to some arbitrary value. Keeps compiler warnings down. */
|
||||||
PRUint32 file_mmap_offset, alignment;
|
PRUint32 file_mmap_offset, alignment;
|
||||||
PRInt64 zero64;
|
PRInt64 zero64;
|
||||||
PROffset64 file_mmap_offset64;
|
PROffset64 file_mmap_offset64;
|
||||||
|
|
|
@ -970,7 +970,7 @@ PR_IMPLEMENT(PRRecvWait*) PR_WaitRecvReady(PRWaitGroup *group)
|
||||||
** it is still full of if's with continue and goto.
|
** it is still full of if's with continue and goto.
|
||||||
*/
|
*/
|
||||||
PRStatus st;
|
PRStatus st;
|
||||||
while (PR_CLIST_IS_EMPTY(&group->io_ready))
|
do
|
||||||
{
|
{
|
||||||
st = PR_WaitCondVar(group->io_complete, PR_INTERVAL_NO_TIMEOUT);
|
st = PR_WaitCondVar(group->io_complete, PR_INTERVAL_NO_TIMEOUT);
|
||||||
if (_prmw_running != group->state)
|
if (_prmw_running != group->state)
|
||||||
|
@ -979,7 +979,7 @@ PR_IMPLEMENT(PRRecvWait*) PR_WaitRecvReady(PRWaitGroup *group)
|
||||||
goto aborted;
|
goto aborted;
|
||||||
}
|
}
|
||||||
if (_MW_ABORTED(st) || (NULL == group->poller)) break;
|
if (_MW_ABORTED(st) || (NULL == group->poller)) break;
|
||||||
}
|
} while (PR_CLIST_IS_EMPTY(&group->io_ready));
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** The thread is interrupted and has to leave. It might
|
** The thread is interrupted and has to leave. It might
|
||||||
|
|
|
@ -419,7 +419,7 @@ Convert(ScanfState *state, const char *fmt)
|
||||||
{
|
{
|
||||||
const char *cPtr;
|
const char *cPtr;
|
||||||
int ch;
|
int ch;
|
||||||
char *cArg;
|
char *cArg = NULL;
|
||||||
|
|
||||||
state->converted = PR_FALSE;
|
state->converted = PR_FALSE;
|
||||||
cPtr = fmt;
|
cPtr = fmt;
|
||||||
|
|
|
@ -625,7 +625,7 @@ extern PRFileMap * _md_ImportFileMapFromString(
|
||||||
PRInt32 osfd;
|
PRInt32 osfd;
|
||||||
PRIntn prot; /* really: a PRFileMapProtect */
|
PRIntn prot; /* really: a PRFileMapProtect */
|
||||||
PRFileDesc *fd;
|
PRFileDesc *fd;
|
||||||
PRFileMap *fm;
|
PRFileMap *fm = NULL; /* default return value */
|
||||||
PRFileInfo64 info;
|
PRFileInfo64 info;
|
||||||
|
|
||||||
PR_sscanf( fmstring, "%ld:%d", &osfd, &prot );
|
PR_sscanf( fmstring, "%ld:%d", &osfd, &prot );
|
||||||
|
|
Загрузка…
Ссылка в новой задаче