diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mostly indenting

Browse Source
This commit is contained in:
Vítor Santos Costa 2015-10-05 10:33:52 +01:00
parent e5fc818c37
commit 166d4892f9
1 changed files with 990 additions and 991 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
os/iopreds.c
View File

@ -360,7 +360,7 @@ Yap_InitStdStreams (void)
Int
PlIOError__ (const char *function, int lineno, const char *file, yap_error_number type, Term culprit, ...)
PlIOError__ (const char *file, const char *function, int lineno, yap_error_number type, Term culprit, ...)
{
if (trueLocalPrologFlag(FILEERRORS_FLAG) == MkIntTerm(1) ||
@ -373,7 +373,7 @@ PlIOError__ (const char *function, int lineno, const char *file, yap_error_numbe
format = va_arg(args, char *);
vsnprintf(who, 1023, format, args);
va_end( args );
Yap_Error__(function, lineno,file, type, culprit, who);
Yap_Error__(file, function, lineno, type, culprit, who);
/* and fail */
return FALSE;
} else {
@ -1787,11 +1787,13 @@ Yap_OpenStream(FILE *fd, char *name, Term file_name, int flags)
sname = AtomUserOut;
}
}
LOCK(GLOBAL_StreamDescLock);
if ((sno = Yap_CheckAlias(sname)) == -1) {
UNLOCK(GLOBAL_StreamDescLock);
if ((sno = Yap_CheckAlias(sname)) < 0) {
UNLOCK(GLOBAL_Stream[sno].streamlock);
Yap_Error(EXISTENCE_ERROR_STREAM, arg, msg);
return -1;
} else {
LOCK(GLOBAL_Stream[sno].streamlock);
return sno;
}
} else if (IsApplTerm (arg) && FunctorOfTerm (arg) == FunctorStream) {
arg = ArgOfTerm (1, arg);
@ -1802,17 +1804,14 @@ Yap_OpenStream(FILE *fd, char *name, Term file_name, int flags)
if (sno < 0)
{
Yap_Error(DOMAIN_ERROR_STREAM_OR_ALIAS, arg, msg);
UNLOCK(GLOBAL_StreamDescLock);
return (-1);
}
if (GLOBAL_Stream[sno].status & Free_Stream_f)
{
PlIOError(EXISTENCE_ERROR_STREAM, arg, msg);
UNLOCK(GLOBAL_StreamDescLock);
return (-1);
}
LOCK(GLOBAL_Stream[sno].streamlock);
UNLOCK(GLOBAL_StreamDescLock);
if ((GLOBAL_Stream[sno].status & kind) == 0)
{
UNLOCK(GLOBAL_Stream[sno].streamlock);