ObjFW  Diff

Differences From Artifact [f5689e7f1a]:

• File src/OFStdIOStream.m — part of check-in [085bfc12a0] at 2013-04-27 01:26:35 on branch trunk — Add OFStdIOStream.

  This is used for of_std{in,out,err} now instead of OFFile. (user: js, size: 3105) [annotate] [blame] [check-ins using]

To Artifact [0fb850ba21]:

• File src/OFStdIOStream.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: 3048) [annotate] [blame] [check-ins using]

95
96
97
98
99
100
101
102

103
104

105
106
107
108
109
110
111
112
113
114
115
116

117
118

119
120
121
122
123
124
125

95
96
97
98
99
100
101

102


103
104
105
106
107
108
109
110
111
112
113
114

115


116
117
118
119
120
121
122
123

-
+
-
-
+











-
+
-
-
+

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

	if (_fd == -1 || _atEndOfStream ||
	    (ret = read(_fd, buffer, length)) < 0)
		@throw [OFReadFailedException exceptionWithClass: [self class]
		@throw [OFReadFailedException exceptionWithStream: self
							  stream: self
						 requestedLength: length];
						  requestedLength: length];

	if (ret == 0)
		_atEndOfStream = true;

	return ret;
}

- (void)lowlevelWriteBuffer: (const void*)buffer
		     length: (size_t)length
{
	if (_fd == -1 || _atEndOfStream || write(_fd, buffer, length) < length)
		@throw [OFWriteFailedException exceptionWithClass: [self class]
		@throw [OFWriteFailedException exceptionWithStream: self
							   stream: self
						  requestedLength: length];
						   requestedLength: length];
}

- (int)fileDescriptorForReading
{
	return _fd;
}