Overview
Comment: | Rename -[string] to -[description] in OFException. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
684d24b23e3c22c090274f784ba4d360 |
User & Date: | js on 2010-12-07 23:53:29 |
Other Links: | manifest | tags |
Context
2010-12-08
| ||
23:18 | Fix local labels in inline assembly. check-in: c10cc0f9e2 user: js tags: trunk | |
2010-12-07
| ||
23:53 | Rename -[string] to -[description] in OFException. check-in: 684d24b23e user: js tags: trunk | |
2010-12-06
| ||
13:24 | Add -[description] to OFNumber. check-in: b965dad5f8 user: js tags: trunk | |
Changes
Modified src/OFExceptions.h from [39ed0da333] to [0762a06ea3].
︙ | ︙ | |||
25 26 27 28 29 30 31 | * This is the only exception that is not an OFException as it's special. * It does not know for which class allocation failed and it should not be * handled like other exceptions, as the exception handling code is not * allowed to allocate ANY memory. */ @interface OFAllocFailedException: OFObject /** | | | | | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 | * This is the only exception that is not an OFException as it's special. * It does not know for which class allocation failed and it should not be * handled like other exceptions, as the exception handling code is not * allowed to allocate ANY memory. */ @interface OFAllocFailedException: OFObject /** * \return A description of the exception */ - (OFString*)description; @end /** * \brief The base class for all exceptions in ObjFW * * The OFException class is the base class for all exceptions in ObjFW, except * the OFAllocFailedException. * * IMPORTANT: Exceptions do NOT use OFAutoreleasePools and can't be autoreleased * either! You have to make sure to dealloc the exception in your \@catch block! */ @interface OFException: OFObject { Class inClass; OFString *description; } #ifdef OF_HAVE_PROPERTIES @property (readonly, nonatomic) Class inClass; #endif /** |
︙ | ︙ | |||
71 72 73 74 75 76 77 | /** * \return The class of the object in which the exception happened */ - (Class)inClass; /** | | | | 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 | /** * \return The class of the object in which the exception happened */ - (Class)inClass; /** * \return A description of the exception */ - (OFString*)description; @end /** * \brief An exception indicating there is not enough memory available. */ @interface OFOutOfMemoryException: OFException { |
︙ | ︙ |
Modified src/OFExceptions.m from [d710bc9531] to [f88616d600].
︙ | ︙ | |||
133 134 135 136 137 138 139 | - (void)dealloc { @throw [OFNotImplementedException newWithClass: isa selector: _cmd]; [super dealloc]; /* Get rid of a stupid warning */ } | | | 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 | - (void)dealloc { @throw [OFNotImplementedException newWithClass: isa selector: _cmd]; [super dealloc]; /* Get rid of a stupid warning */ } - (OFString*)description { return @"Allocating an object failed!"; } @end @implementation OFException + newWithClass: (Class)class_ |
︙ | ︙ | |||
164 165 166 167 168 169 170 | inClass = class_; return self; } - (void)dealloc { | | | | | 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 | inClass = class_; return self; } - (void)dealloc { [description release]; [super dealloc]; } - (Class)inClass { return inClass; } - (OFString*)description { return @"An exception occurred"; } - autorelease { @throw [OFNotImplementedException newWithClass: isa selector: _cmd]; } |
︙ | ︙ | |||
204 205 206 207 208 209 210 | self = [super initWithClass: class_]; requestedSize = size; return self; } | | | | | | | | | | | | | 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 | self = [super initWithClass: class_]; requestedSize = size; return self; } - (OFString*)description { if (description != nil) return description; if (requestedSize) description = [[OFString alloc] initWithFormat: @"Could not allocate %zu bytes in class %s!", requestedSize, [inClass className]]; else description = [[OFString alloc] initWithFormat: @"Could not allocate enough memory in class %s!", [inClass className]]; return description; } - (size_t)requestedSize { return requestedSize; } @end @implementation OFEnumerationMutationException - (OFString*)description { if (description != nil) return description; description = [[OFString alloc] initWithFormat: @"Object of class %s was mutated during enumeration!", [inClass className]]; return description; } @end @implementation OFMemoryNotPartOfObjectException + newWithClass: (Class)class_ pointer: (void*)ptr { |
︙ | ︙ | |||
267 268 269 270 271 272 273 | self = [super initWithClass: class_]; pointer = ptr; return self; } | | | | | | | 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 | self = [super initWithClass: class_]; pointer = ptr; return self; } - (OFString*)description { if (description != nil) return description; description = [[OFString alloc] initWithFormat: @"Memory at %p was not allocated as part of object of class %s, " @"thus the memory allocation was not changed! It is also possible " @"that there was an attempt to free the same memory twice.", pointer, [inClass className]]; return description; } - (void*)pointer { return pointer; } @end |
︙ | ︙ | |||
313 314 315 316 317 318 319 | self = [super initWithClass: class_]; selector = selector_; return self; } | | | | | | | | | | | | 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 | self = [super initWithClass: class_]; selector = selector_; return self; } - (OFString*)description { if (description != nil) return description; description = [[OFString alloc] initWithFormat: @"The method %s of class %s is not or not fully implemented!", sel_getName(selector), [inClass className]]; return description; } - (SEL)selector { return selector; } @end @implementation OFOutOfRangeException - (OFString*)description { if (description != nil) return description; description = [[OFString alloc] initWithFormat: @"Value out of range in class %s!", [inClass className]]; return description; } @end @implementation OFInvalidArgumentException + newWithClass: (Class)class_ selector: (SEL)selector_ { |
︙ | ︙ | |||
370 371 372 373 374 375 376 | self = [super initWithClass: class_]; selector = selector_; return self; } | | | | | | | | | | | | | | | | | | | | | | | | | | | 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 | self = [super initWithClass: class_]; selector = selector_; return self; } - (OFString*)description { if (description != nil) return description; description = [[OFString alloc] initWithFormat: @"The argument for method %s of class %s is invalid!", sel_getName(selector), [inClass className]]; return description; } - (SEL)selector { return selector; } @end @implementation OFInvalidEncodingException - (OFString*)description { if (description != nil) return description; description = [[OFString alloc] initWithFormat: @"The encoding is invalid for class %s!", [inClass className]]; return description; } @end @implementation OFInvalidFormatException - (OFString*)description { if (description != nil) return description; description = [[OFString alloc] initWithFormat: @"The format is invalid for class %s!", [inClass className]]; return description; } @end @implementation OFMalformedXMLException - (OFString*)description { if (description != nil) return description; description = [[OFString alloc] initWithFormat: @"The parser in class %s encountered malformed or invalid XML!", [inClass className]]; return description; } @end @implementation OFInitializationFailedException - (OFString*)description { if (description != nil) return description; description = [[OFString alloc] initWithFormat: @"Initialization failed for class %s!", [inClass className]]; return description; } @end @implementation OFOpenFileFailedException + newWithClass: (Class)class_ path: (OFString*)path mode: (OFString*)mode |
︙ | ︙ | |||
485 486 487 488 489 490 491 | { [path release]; [mode release]; [super dealloc]; } | | | | | | | 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 | { [path release]; [mode release]; [super dealloc]; } - (OFString*)description { if (description != nil) return description; description = [[OFString alloc] initWithFormat: @"Failed to open file %s with mode %s in class %s! " ERRFMT, [path cString], [mode cString], [inClass className], ERRPARAM]; return description; } - (int)errNo { return errNo; } |
︙ | ︙ | |||
556 557 558 559 560 561 562 | - (size_t)requestedSize { return requestedSize; } @end @implementation OFReadFailedException | | | | | | | | | | | | | | | | | 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 | - (size_t)requestedSize { return requestedSize; } @end @implementation OFReadFailedException - (OFString*)description { if (description != nil) return description; description = [[OFString alloc] initWithFormat: @"Failed to read %zu bytes in class %s! " ERRFMT, requestedSize, [inClass className], ERRPARAM]; return description; } @end @implementation OFWriteFailedException - (OFString*)description { if (description != nil) return description; description = [[OFString alloc] initWithFormat: @"Failed to write %zu bytes in class %s! " ERRFMT, requestedSize, [inClass className], ERRPARAM]; return description; } @end @implementation OFSeekFailedException - initWithClass: (Class)class_ { self = [super initWithClass: class_]; errNo = GET_ERRNO; return self; } - (OFString*)description { if (description != nil) return description; description = [[OFString alloc] initWithFormat: @"Seeking failed in class %s! " ERRFMT, [inClass className], ERRPARAM]; return description; } - (int)errNo { return errNo; } @end |
︙ | ︙ | |||
650 651 652 653 654 655 656 | - (void)dealloc { [path release]; [super dealloc]; } | | | | | | | 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 | - (void)dealloc { [path release]; [super dealloc]; } - (OFString*)description { if (description != nil) return description; description = [[OFString alloc] initWithFormat: @"Failed to create directory %s in class %s! " ERRFMT, [path cString], [inClass className], ERRPARAM]; return description; } - (int)errNo { return errNo; } |
︙ | ︙ | |||
717 718 719 720 721 722 723 | - (void)dealloc { [path release]; [super dealloc]; } | | | | | | | 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 | - (void)dealloc { [path release]; [super dealloc]; } - (OFString*)description { if (description != nil) return description; description = [[OFString alloc] initWithFormat: @"Failed to change mode for file %s to %d in class %s! " ERRFMT, [path cString], mode, [inClass className], ERRPARAM]; return description; } - (int)errNo { return errNo; } |
︙ | ︙ | |||
793 794 795 796 797 798 799 | - (void)dealloc { [path release]; [super dealloc]; } | | | | | | | 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 | - (void)dealloc { [path release]; [super dealloc]; } - (OFString*)description { if (description != nil) return description; description = [[OFString alloc] initWithFormat: @"Failed to change owner for file %s to %d:%d in class %s! " ERRFMT, [path cString], owner, group, [inClass className], ERRPARAM]; return description; } - (int)errNo { return errNo; } |
︙ | ︙ | |||
871 872 873 874 875 876 877 | { [sourcePath release]; [destinationPath release]; [super dealloc]; } | | | | | | | 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 | { [sourcePath release]; [destinationPath release]; [super dealloc]; } - (OFString*)description { if (description != nil) return description; description = [[OFString alloc] initWithFormat: @"Failed to copy file %s to %s in class %s! " ERRFMT, [sourcePath cString], [destinationPath cString], [inClass className], ERRPARAM]; return description; } - (int)errNo { return errNo; } |
︙ | ︙ | |||
944 945 946 947 948 949 950 | { [sourcePath release]; [destinationPath release]; [super dealloc]; } | | | | | | | 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 | { [sourcePath release]; [destinationPath release]; [super dealloc]; } - (OFString*)description { if (description != nil) return description; description = [[OFString alloc] initWithFormat: @"Failed to rename file %s to %s in class %s! " ERRFMT, [sourcePath cString], [destinationPath cString], [inClass className], ERRPARAM]; return description; } - (int)errNo { return errNo; } |
︙ | ︙ | |||
1012 1013 1014 1015 1016 1017 1018 | - (void)dealloc { [path release]; [super dealloc]; } | | | | | | | 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 | - (void)dealloc { [path release]; [super dealloc]; } - (OFString*)description { if (description != nil) return description; description = [[OFString alloc] initWithFormat: @"Failed to delete file %s in class %s! " ERRFMT, [path cString], [inClass className], ERRPARAM]; return description; } - (int)errNo { return errNo; } |
︙ | ︙ | |||
1074 1075 1076 1077 1078 1079 1080 | - (void)dealloc { [path release]; [super dealloc]; } | | | | | | | 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 | - (void)dealloc { [path release]; [super dealloc]; } - (OFString*)description { if (description != nil) return description; description = [[OFString alloc] initWithFormat: @"Failed to delete directory %s in class %s! " ERRFMT, [path cString], [inClass className], ERRPARAM]; return description; } - (int)errNo { return errNo; } |
︙ | ︙ | |||
1137 1138 1139 1140 1141 1142 1143 | { [sourcePath release]; [destinationPath release]; [super dealloc]; } | | | | | | | 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 | { [sourcePath release]; [destinationPath release]; [super dealloc]; } - (OFString*)description { if (description != nil) return description; description = [[OFString alloc] initWithFormat: @"Failed to link file %s to %s in class %s! " ERRFMT, [sourcePath cString], [destinationPath cString], [inClass className], ERRPARAM]; return description; } - (int)errNo { return errNo; } |
︙ | ︙ | |||
1205 1206 1207 1208 1209 1210 1211 | { [sourcePath release]; [destinationPath release]; [super dealloc]; } | | | | | | | | | | | | | | | | | | | | | | 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 | { [sourcePath release]; [destinationPath release]; [super dealloc]; } - (OFString*)description { if (description != nil) return description; description = [[OFString alloc] initWithFormat: @"Failed to symlink file %s to %s in class %s! " ERRFMT, [sourcePath cString], [destinationPath cString], [inClass className], ERRPARAM]; return description; } - (int)errNo { return errNo; } - (OFString*)sourcePath { return sourcePath; } - (OFString*)destinationPath { return destinationPath; } @end #endif @implementation OFSetOptionFailedException - (OFString*)description { if (description != nil) return description; description = [[OFString alloc] initWithFormat: @"Setting an option in class %s failed!", [inClass className]]; return description; } @end @implementation OFNotConnectedException - (OFString*)description { if (description != nil) return description; description = [[OFString alloc] initWithFormat: @"The socket of type %s is not connected or bound!", [inClass className]]; return description; } @end @implementation OFAlreadyConnectedException - (OFString*)description { if (description != nil) return description; description = [[OFString alloc] initWithFormat: @"The socket of type %s is already connected or bound and thus " @"can't be connected or bound again!", [inClass className]]; return description; } @end @implementation OFAddressTranslationFailedException + newWithClass: (Class)class_ node: (OFString*)node service: (OFString*)service |
︙ | ︙ | |||
1321 1322 1323 1324 1325 1326 1327 | { [node release]; [service release]; [super dealloc]; } | | | | | | | | 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 | { [node release]; [service release]; [super dealloc]; } - (OFString*)description { if (description != nil) return description; if (node != nil && service != nil) description = [[OFString alloc] initWithFormat: @"The service %s on %s could not be translated to an " @"address in class %s. This means that either the node was " @"not found, there is no such service on the node, there " @"was a problem with the name server, there was a problem " @"with your network connection or you specified an invalid " @"node or service. " ERRFMT, [service cString], [node cString], [inClass className], AT_ERRPARAM]; else description = [[OFString alloc] initWithFormat: @"An address translation failed in class %s! " ERRFMT, [inClass className], AT_ERRPARAM]; return description; } - (int)errNo { return errNo; } |
︙ | ︙ | |||
1403 1404 1405 1406 1407 1408 1409 | { [node release]; [service release]; [super dealloc]; } | | | | | | | 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 | { [node release]; [service release]; [super dealloc]; } - (OFString*)description { if (description != nil) return description; description = [[OFString alloc] initWithFormat: @"A connection to service %s on node %s could not be established " @"in class %s! " ERRFMT, [service cString], [node cString], [inClass className], ERRPARAM]; return description; } - (int)errNo { return errNo; } |
︙ | ︙ | |||
1480 1481 1482 1483 1484 1485 1486 | { [node release]; [service release]; [super dealloc]; } | | | | | | | 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 | { [node release]; [service release]; [super dealloc]; } - (OFString*)description { if (description != nil) return description; description = [[OFString alloc] initWithFormat: @"Binding service %s on node %s using family %d failed in class " @"%s! " ERRFMT, [service cString], [node cString], family, [inClass className], ERRPARAM]; return description; } - (int)errNo { return errNo; } |
︙ | ︙ | |||
1541 1542 1543 1544 1545 1546 1547 | backLog = backlog; errNo = GET_SOCK_ERRNO; return self; } | | | | | | | 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 | backLog = backlog; errNo = GET_SOCK_ERRNO; return self; } - (OFString*)description { if (description != nil) return description; description = [[OFString alloc] initWithFormat: @"Failed to listen in socket of type %s with a back log of %d! " ERRFMT, [inClass className], backLog, ERRPARAM]; return description; } - (int)errNo { return errNo; } |
︙ | ︙ | |||
1574 1575 1576 1577 1578 1579 1580 | self = [super initWithClass: class_]; errNo = GET_SOCK_ERRNO; return self; } | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 | self = [super initWithClass: class_]; errNo = GET_SOCK_ERRNO; return self; } - (OFString*)description { if (description != nil) return description; description = [[OFString alloc] initWithFormat: @"Failed to accept connection in socket of type %s! " ERRFMT, [inClass className], ERRPARAM]; return description; } - (int)errNo { return errNo; } @end @implementation OFThreadStartFailedException - (OFString*)description { if (description != nil) return description; description = [[OFString alloc] initWithFormat: @"Starting a thread of class %s failed!", [inClass className]]; return description; } @end @implementation OFThreadJoinFailedException - (OFString*)description { if (description != nil) return description; description = [[OFString alloc] initWithFormat: @"Joining a thread of class %s failed! Most likely, another thread " @"already waits for the thread to join.", [inClass className]]; return description; } @end @implementation OFThreadStillRunningException - (OFString*)description { if (description != nil) return description; description = [[OFString alloc] initWithFormat: @"Deallocation of a thread of type %s was tried, even though it " @"was still running", [inClass className]]; return description; } @end @implementation OFMutexLockFailedException - (OFString*)description { if (description != nil) return description; description = [[OFString alloc] initWithFormat: @"A mutex could not be locked in class %s", [inClass className]]; return description; } @end @implementation OFMutexUnlockFailedException - (OFString*)description { if (description != nil) return description; description = [[OFString alloc] initWithFormat: @"A mutex could not be unlocked in class %s", [inClass className]]; return description; } @end @implementation OFHashAlreadyCalculatedException - (OFString*)description { if (description != nil) return description; description = [[OFString alloc] initWithFormat: @"The hash has already been calculated in class %s and thus no new " @"data can be added", [inClass className]]; return description; } @end @implementation OFUnboundNamespaceException + newWithClass: (Class)class_ namespace: (OFString*)ns { |
︙ | ︙ | |||
1734 1735 1736 1737 1738 1739 1740 | { [ns release]; [prefix release]; [super dealloc]; } | | | | | | | | 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 | { [ns release]; [prefix release]; [super dealloc]; } - (OFString*)description { if (description != nil) return description; if (ns != nil) description = [[OFString alloc] initWithFormat: @"The namespace %s is not bound in class %s", [inClass className]]; else if (prefix != nil) description = [[OFString alloc] initWithFormat: @"The prefix %s is not bound to any namespace in %s", [inClass className]]; return description; } - (OFString*)namespace { return ns; } - (OFString*)prefix { return prefix; } @end |