--- a/UnixOperatingSystem.st Thu Nov 05 15:34:58 2009 +0100
+++ b/UnixOperatingSystem.st Thu Nov 05 15:35:41 2009 +0100
@@ -12242,64 +12242,64 @@
int offs, __startIndex, __maxBytes;
if (!__isSmallInteger(__INST(fd))) {
- error = @symbol(badFd);
- goto err;
+ error = @symbol(badFd);
+ goto err;
}
if (!__isSmallInteger(startIndex) ||
- (__startIndex = __intVal(startIndex)-1) < 0) {
- if (startIndex == nil) {
- __startIndex = 0;
- } else {
- error = @symbol(badArgument3);
- goto err;
- }
+ (__startIndex = __intVal(startIndex)-1) < 0) {
+ if (startIndex == nil) {
+ __startIndex = 0;
+ } else {
+ error = @symbol(badArgument3);
+ goto err;
+ }
}
if (__isSmallInteger(maxBytes)) {
- __maxBytes = __intVal(maxBytes);
+ __maxBytes = __intVal(maxBytes);
} else if (maxBytes == nil) {
- __maxBytes = -1;
+ __maxBytes = -1;
} else {
- error = @symbol(badArgument4);
- goto err;
+ error = @symbol(badArgument4);
+ goto err;
}
if (!__isInteger(flags)) {
- error = @symbol(badArgument5);
- goto err;
+ error = @symbol(badArgument5);
+ goto err;
}
__flags = __longIntVal(flags);
sock = __smallIntegerVal(__INST(fd));
oClass = __Class(aDataBuffer);
switch (_intVal(_ClassInstPtr(oClass)->c_flags) & ARRAYMASK) {
- case BYTEARRAY:
- offs = __startIndex;
- break;
- case WORDARRAY:
- case SWORDARRAY:
- offs = __startIndex * 2;
- break;
- case LONGARRAY:
- case SLONGARRAY:
- offs = __startIndex * 4;
- break;
- case LONGLONGARRAY:
- case SLONGLONGARRAY:
- offs = __startIndex * 8;
+ case BYTEARRAY:
+ offs = __startIndex;
+ break;
+ case WORDARRAY:
+ case SWORDARRAY:
+ offs = __startIndex * 2;
+ break;
+ case LONGARRAY:
+ case SLONGARRAY:
+ offs = __startIndex * 4;
+ break;
+ case LONGLONGARRAY:
+ case SLONGLONGARRAY:
+ offs = __startIndex * 8;
# ifdef __NEED_LONGLONG_ALIGN
- offs += 4;
-# endif
- case FLOATARRAY:
- offs = __startIndex * sizeof(float);
- break;
- case DOUBLEARRAY:
- offs = __startIndex * sizeof(double);
+ offs += 4;
+# endif
+ case FLOATARRAY:
+ offs = __startIndex * sizeof(float);
+ break;
+ case DOUBLEARRAY:
+ offs = __startIndex * sizeof(double);
# ifdef __NEED_DOUBLE_ALIGN
- offs += 4;
-# endif
- break;
- default:
- error = @symbol(badArgument2);
- goto err;
+ offs += 4;
+# endif
+ break;
+ default:
+ error = @symbol(badArgument2);
+ goto err;
}
nInstVars = __smallIntegerVal(_ClassInstPtr(oClass)->c_ninstvars);
@@ -12308,35 +12308,35 @@
if (__maxBytes >= 0 && __maxBytes < objSize) {
# ifdef DGRAM_DEBUG
- printf("cut off ...\n");
-# endif
- objSize = __maxBytes;
+ printf("cut off ...\n");
+# endif
+ objSize = __maxBytes;
}
if (socketAddress == nil) {
- alen = 0;
+ alen = 0;
} else {
- if (! __isByteArray(socketAddress)) {
- error = @symbol(badArgument1);
- goto err;
- }
- alen = __byteArraySize(socketAddress);
+ if (! __isByteArrayLike(socketAddress)) {
+ error = @symbol(badArgument1);
+ goto err;
+ }
+ alen = __byteArraySize(socketAddress);
}
saPtr = (struct sockaddr *)0;
again:
if (alen)
- saPtr = (struct sockaddr *)__byteArrayVal(socketAddress);
+ saPtr = (struct sockaddr *)__byteArrayVal(socketAddress);
cp = (char *)__InstPtr(aDataBuffer) + nInstBytes + offs;
n = sendto(sock, cp, objSize, __flags, saPtr, alen);
if (n < 0) {
- if (errno == EINTR) {
- __HANDLE_INTERRUPTS__;
- goto again;
- } else {
- error = __mkSmallInteger(errno);
- goto err;
- }
+ if (errno == EINTR) {
+ __HANDLE_INTERRUPTS__;
+ goto again;
+ } else {
+ error = __mkSmallInteger(errno);
+ goto err;
+ }
}
RETURN (__mkSmallInteger(n));
#endif
@@ -12531,48 +12531,48 @@
char *p;
if (!__isSmallInteger(__INST(fd))) {
- error = @symbol(badFd);
- goto err;
+ error = @symbol(badFd);
+ goto err;
}
if (__isSmallInteger(level)) {
- __level = __smallIntegerVal(level);
+ __level = __smallIntegerVal(level);
} else if (level == @symbol(SOL_SOCKET)) {
- __level = SOL_SOCKET;
+ __level = SOL_SOCKET;
} else {
- error = @symbol(badArgument1);
- goto err;
+ error = @symbol(badArgument1);
+ goto err;
}
if (__isSmallInteger(name)) {
- __name = __smallIntegerVal(name);
+ __name = __smallIntegerVal(name);
} else if (name == @symbol(SO_REUSEADDR)) {
- __name = SO_REUSEADDR;
+ __name = SO_REUSEADDR;
} else {
- error = @symbol(badArgument2);
- goto err;
+ error = @symbol(badArgument2);
+ goto err;
}
if (__isSmallInteger(value)) {
- intval = __intVal(value);
- p = (char *) &intval;
- sz = sizeof(intval);
- } else if (__isByteArray(value)) {
- p = __byteArrayVal(value);
- sz = __byteArraySize(value);
+ intval = __intVal(value);
+ p = (char *) &intval;
+ sz = sizeof(intval);
+ } else if (__isByteArrayLike(value)) {
+ p = __byteArrayVal(value);
+ sz = __byteArraySize(value);
} else {
- error = @symbol(badArgument3);
- goto err;
+ error = @symbol(badArgument3);
+ goto err;
}
sock = __smallIntegerVal(__INST(fd));
if (setsockopt(sock, __level, __name, p, sz) < 0) {
- error = __mkSmallInteger(errno);
+ error = __mkSmallInteger(errno);
}
err:;
#endif
%}.
error notNil ifTrue:[
- ^ self error:error
+ ^ self error:error
].
^ nil.
!
@@ -12701,11 +12701,11 @@
!UnixOperatingSystem class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.259 2009-11-05 14:05:29 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.260 2009-11-05 14:35:41 stefan Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.259 2009-11-05 14:05:29 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.260 2009-11-05 14:35:41 stefan Exp $'
! !
UnixOperatingSystem initialize!