ObjFW  Diff

Differences From Artifact [791405f855]:

• File src/OFStreamSocket.m — part of check-in [1833194867] at 2021-01-14 02:29:31 on branch trunk — Define _HPUX_ALT_XOPEN_SOCKET_API where necessary

  There is a nasty bug in HP-UX: When using the proper socket APIs that
  take a socklen_t (which is 64 bit in LP64 mode), it still calls into
  methods that expect an int - so there is a type mismatch between the
  headers and the compiled system libraries. This leads to all socklen_t
  being interpreted as 0 (due to big endian). Defining
  _HPUX_ALT_XOPEN_SOCKET_API makes it use the correct symbols in the
  system libraries instead. (user: js, size: 8364) [annotate] [blame] [check-ins using]

To Artifact [7f5d88caa9]:

• File src/OFStreamSocket.m — part of check-in [1b82d3bf4f] at 2021-03-07 20:25:21 on branch trunk — *.m: Fold methods into one line where it fits (user: js, size: 8350) [annotate] [blame] [check-ins using] [more...]

93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108

{
	if (_socket == INVALID_SOCKET)
		@throw [OFNotOpenException exceptionWithObject: self];

	return _atEndOfStream;
}

- (size_t)lowlevelReadIntoBuffer: (void *)buffer
			  length: (size_t)length
{
	ssize_t ret;

	if (_socket == INVALID_SOCKET)
		@throw [OFNotOpenException exceptionWithObject: self];

#ifndef OF_WINDOWS

|
<

93
94
95
96
97
98
99
100

101
102
103
104
105
106
107

{
	if (_socket == INVALID_SOCKET)
		@throw [OFNotOpenException exceptionWithObject: self];

	return _atEndOfStream;
}

- (size_t)lowlevelReadIntoBuffer: (void *)buffer length: (size_t)length

{
	ssize_t ret;

	if (_socket == INVALID_SOCKET)
		@throw [OFNotOpenException exceptionWithObject: self];

#ifndef OF_WINDOWS

124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139

	if (ret == 0)
		_atEndOfStream = true;

	return ret;
}

- (size_t)lowlevelWriteBuffer: (const void *)buffer
		       length: (size_t)length
{
	if (_socket == INVALID_SOCKET)
		@throw [OFNotOpenException exceptionWithObject: self];

#ifndef OF_WINDOWS
	ssize_t bytesWritten;

|
<

123
124
125
126
127
128
129
130

131
132
133
134
135
136
137

	if (ret == 0)
		_atEndOfStream = true;

	return ret;
}

- (size_t)lowlevelWriteBuffer: (const void *)buffer length: (size_t)length

{
	if (_socket == INVALID_SOCKET)
		@throw [OFNotOpenException exceptionWithObject: self];

#ifndef OF_WINDOWS
	ssize_t bytesWritten;