ObjFW  Diff

Differences From Artifact [252939c90a]:

• File src/OFStreamSocket.m — part of check-in [3d16a30f41] at 2013-06-22 12:12:36 on branch trunk — Rework exceptions.

  This mostly removes the argument for the class in which the exception
  occurred. As backtraces were recently added for all platforms, the
  passed class does not give any extra information on where the exception
  occurred anymore.

  This also removes a few other arguments which were not too helpful. In
  the past, the idea was to pass as many arguments as possible so that it
  is easier to find the origin of the exception. However, as backtraces
  are a much better way to find the origin, those are not useful anymore
  and just make the exception more cumbersome to use. The rule is now to
  only pass arguments that might help in recovering from the exception or
  provide information that is otherwise not easily accessible. (user: js, size: 3629) [annotate] [blame] [check-ins using]

To Artifact [e9adb99946]:

• File src/OFStreamSocket.m — part of check-in [e0182a3e55] at 2013-06-28 18:48:14 on branch trunk — OFHTTPClient: Only retry on ECONNRESET or EPIPE. (user: js, size: 3517) [annotate] [blame] [check-ins using]

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

		@throw [OFNotConnectedException exceptionWithSocket: self];

	if (_atEndOfStream) {
		OFReadFailedException *e;

		e = [OFReadFailedException exceptionWithStream: self
					       requestedLength: length];
#ifndef _WIN32
		e->_errNo = ENOTCONN;
#else
		e->_errNo = WSAENOTCONN;
#endif

		@throw e;
	}

	if ((ret = recv(_socket, buffer, length, 0)) < 0)
		@throw [OFReadFailedException exceptionWithStream: self
						  requestedLength: length];

<

<
<
<
<

93
94
95
96
97
98
99

100




101
102
103
104
105
106
107

		@throw [OFNotConnectedException exceptionWithSocket: self];

	if (_atEndOfStream) {
		OFReadFailedException *e;

		e = [OFReadFailedException exceptionWithStream: self
					       requestedLength: length];

		e->_errNo = ENOTCONN;




		@throw e;
	}

	if ((ret = recv(_socket, buffer, length, 0)) < 0)
		@throw [OFReadFailedException exceptionWithStream: self
						  requestedLength: length];

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

		@throw [OFNotConnectedException exceptionWithSocket: self];

	if (_atEndOfStream) {
		OFWriteFailedException *e;

		e = [OFWriteFailedException exceptionWithStream: self
						requestedLength: length];
#ifndef _WIN32
		e->_errNo = ENOTCONN;
#else
		e->_errNo = WSAENOTCONN;
#endif

		@throw e;
	}

	if (send(_socket, buffer, length, 0) < length)
		@throw [OFWriteFailedException exceptionWithStream: self
						   requestedLength: length];
}

<

<
<
<
<

118
119
120
121
122
123
124

125




126
127
128
129
130
131
132

		@throw [OFNotConnectedException exceptionWithSocket: self];

	if (_atEndOfStream) {
		OFWriteFailedException *e;

		e = [OFWriteFailedException exceptionWithStream: self
						requestedLength: length];

		e->_errNo = ENOTCONN;




		@throw e;
	}

	if (send(_socket, buffer, length, 0) < length)
		@throw [OFWriteFailedException exceptionWithStream: self
						   requestedLength: length];
}