Overview
| Comment: | OFValue: Improve -[description] |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
772e8b8f78e454f4e9df2eae5eb298fc |
| User & Date: | js on 2023-08-09 22:39:27 |
| Other Links: | manifest | tags |
Context
|
2023-08-09
| ||
| 22:53 | OFValue: Add OFVector[34]D check-in: 7b91334e8e user: js tags: trunk | |
| 22:39 | OFValue: Improve -[description] check-in: 772e8b8f78 user: js tags: trunk | |
| 17:02 | Make GCC happy again check-in: cd3d4b44c4 user: js tags: trunk | |
Changes
Modified src/OFHTTPRequest.h from [f431611fce] to [163a3d1bed].
| ︙ | ︙ | |||
49 50 51 52 53 54 55 | } OFHTTPRequestMethod; /** * @struct OFHTTPRequestProtocolVersion OFHTTPRequest.h ObjFW/OFHTTPRequest.h * * @brief The HTTP version of the HTTP request. */ | | | 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 |
} OFHTTPRequestMethod;
/**
* @struct OFHTTPRequestProtocolVersion OFHTTPRequest.h ObjFW/OFHTTPRequest.h
*
* @brief The HTTP version of the HTTP request.
*/
typedef struct OF_BOXABLE OFHTTPRequestProtocolVersion {
/** The major of the HTTP version */
unsigned char major;
/** The minor of the HTTP version */
unsigned char minor;
} OFHTTPRequestProtocolVersion;
/**
|
| ︙ | ︙ |
Modified src/OFObject.h from [2c787e015d] to [6d396e3db6].
| ︙ | ︙ | |||
99 100 101 102 103 104 105 | } OFByteOrder; /** * @struct OFRange OFObject.h ObjFW/OFObject.h * * @brief A range. */ | | | 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 |
} OFByteOrder;
/**
* @struct OFRange OFObject.h ObjFW/OFObject.h
*
* @brief A range.
*/
typedef struct OF_BOXABLE OFRange {
/** The start of the range */
size_t location;
/** The length of the range */
size_t length;
} OFRange;
/**
|
| ︙ | ︙ | |||
150 151 152 153 154 155 156 | typedef double OFTimeInterval; /** * @struct OFPoint OFObject.h ObjFW/OFObject.h * * @brief A point in 2D space. */ | | | 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 |
typedef double OFTimeInterval;
/**
* @struct OFPoint OFObject.h ObjFW/OFObject.h
*
* @brief A point in 2D space.
*/
typedef struct OF_BOXABLE OFPoint {
/** The x coordinate of the point */
float x;
/** The y coordinate of the point */
float y;
} OFPoint;
/**
|
| ︙ | ︙ | |||
196 197 198 199 200 201 202 | } /** * @struct OFSize OFObject.h ObjFW/OFObject.h * * @brief A size. */ | | | 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 |
}
/**
* @struct OFSize OFObject.h ObjFW/OFObject.h
*
* @brief A size.
*/
typedef struct OF_BOXABLE OFSize {
/** The width of the size */
float width;
/** The height of the size */
float height;
} OFSize;
/**
|
| ︙ | ︙ | |||
242 243 244 245 246 247 248 | } /** * @struct OFRect OFObject.h ObjFW/OFObject.h * * @brief A rectangle. */ | | | 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 |
}
/**
* @struct OFRect OFObject.h ObjFW/OFObject.h
*
* @brief A rectangle.
*/
typedef struct OF_BOXABLE OFRect {
/** The point from where the rectangle originates */
OFPoint origin;
/** The size of the rectangle */
OFSize size;
} OFRect;
/**
|
| ︙ | ︙ | |||
293 294 295 296 297 298 299 | } /** * @struct OFVector3D OFObject.h ObjFW/OFObject.h * * @brief A vector in 3D space. */ | | | 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 |
}
/**
* @struct OFVector3D OFObject.h ObjFW/OFObject.h
*
* @brief A vector in 3D space.
*/
typedef struct OF_BOXABLE OFVector3D {
/** The x coordinate of the vector */
float x;
/** The y coordinate of the vector */
float y;
/** The z coordinate of the vector */
float z;
} OFVector3D;
|
| ︙ | ︙ | |||
345 346 347 348 349 350 351 | } /** * @struct OFVector4D OFObject.h ObjFW/OFObject.h * * @brief A vector in 4D space. */ | | | 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 |
}
/**
* @struct OFVector4D OFObject.h ObjFW/OFObject.h
*
* @brief A vector in 4D space.
*/
typedef struct OF_BOXABLE OFVector4D {
/** The x coordinate of the vector */
float x;
/** The y coordinate of the vector */
float y;
/** The z coordinate of the vector */
float z;
/** The w coordinate of the vector */
|
| ︙ | ︙ |
Modified src/OFSocket.h from [ef7090ccb7] to [39b53adb69].
| ︙ | ︙ | |||
175 176 177 178 179 180 181 | #endif /** * @struct OFSocketAddress OFSocket.h ObjFW/OFSocket.h * * @brief A struct which represents a host / port pair for a socket. */ | | | 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 |
#endif
/**
* @struct OFSocketAddress OFSocket.h ObjFW/OFSocket.h
*
* @brief A struct which represents a host / port pair for a socket.
*/
typedef struct OF_BOXABLE OFSocketAddress {
OFSocketAddressFamily family;
/*
* We can't use struct sockaddr as it can contain variable length
* arrays.
*/
union {
struct sockaddr_in in;
|
| ︙ | ︙ |
Modified src/OFValue.m from [f907dbb433] to [358230f36d].
| ︙ | ︙ | |||
248 249 250 251 252 253 254 |
OFRect ret;
[self getValue: &ret size: sizeof(ret)];
return ret;
}
- (OFString *)description
{
| > | < | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 |
OFRect ret;
[self getValue: &ret size: sizeof(ret)];
return ret;
}
- (OFString *)description
{
const char *objCType = self.objCType;
OFMutableString *ret;
size_t size;
unsigned char *value;
if (strcmp(objCType, @encode(OFRange)) == 0 ||
strcmp(objCType, @encode(const OFRange)) == 0) {
OFRange rangeValue;
[self getValue: &rangeValue size: sizeof(rangeValue)];
return [OFString stringWithFormat:
@"<OFValue: OFRange { %zd, %zd }>",
rangeValue.location, rangeValue.length];
} else if (strcmp(objCType, @encode(OFPoint)) == 0 ||
strcmp(objCType, @encode(const OFPoint)) == 0) {
OFPoint pointValue;
[self getValue: &pointValue size: sizeof(pointValue)];
return [OFString stringWithFormat:
@"<OFValue: OFPoint { %g, %g }>",
pointValue.x, pointValue.y];
} else if (strcmp(objCType, @encode(OFSize)) == 0 ||
strcmp(objCType, @encode(const OFSize)) == 0) {
OFSize sizeValue;
[self getValue: &sizeValue size: sizeof(sizeValue)];
return [OFString stringWithFormat:
@"<OFValue: OFSize { %g, %g }>",
sizeValue.width, sizeValue.height];
} else if (strcmp(objCType, @encode(OFRect)) == 0 ||
strcmp(objCType, @encode(const OFRect)) == 0) {
OFRect rectValue;
[self getValue: &rectValue size: sizeof(rectValue)];
return [OFString stringWithFormat:
@"<OFValue: OFRect { %g, %g, %g, %g }>",
rectValue.origin.x, rectValue.origin.y,
rectValue.size.width, rectValue.size.height];
}
ret = [OFMutableString stringWithString: @"<OFValue: "];
size = OFSizeOfTypeEncoding(objCType);
value = OFAllocMemory(1, size);
@try {
[self getValue: value size: size];
for (size_t i = 0; i < size; i++) {
if (i > 0)
[ret appendString: @" "];
|
| ︙ | ︙ |