Comment: | Use OFString as much as possible. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
67066be692234b27a0dd9cad0c094f37 |
User & Date: | js on 2009-05-15 20:01:54 |
Other Links: | manifest | tags |
2009-05-15
| ||
22:59 | As we memset our ivars to 0, get rid of some useless ivar inits. check-in: 4c6d6c56ac user: js tags: trunk | |
20:01 | Use OFString as much as possible. check-in: 67066be692 user: js tags: trunk | |
2009-05-14
| ||
14:24 | Get rid of OFNotInSetException. check-in: bdc9b3219f user: js tags: trunk | |
Modified src/OFExceptions.h from [046ef80792] to [97d15662b8].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | /* * Copyright (c) 2008 - 2009 * Jonathan Schleifer <js@webkeks.org> * * All rights reserved. * * This file is part of libobjfw. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE included in * the packaging of this file. */ #import "OFObject.h" /** * An exception indicating an object could not be allocated. * * This exception is preallocated, as if there's no memory, no exception can * be allocated of course. That's why you shouldn't and even can't deallocate *it. | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | /* * Copyright (c) 2008 - 2009 * Jonathan Schleifer <js@webkeks.org> * * All rights reserved. * * This file is part of libobjfw. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE included in * the packaging of this file. */ #import "OFObject.h" #import "OFString.h" /** * An exception indicating an object could not be allocated. * * This exception is preallocated, as if there's no memory, no exception can * be allocated of course. That's why you shouldn't and even can't deallocate *it. |
︙ | ︙ | |||
27 28 29 30 31 32 33 | { Class isa; } + (Class)class; /** | | | | | | 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 | { Class isa; } + (Class)class; /** * \return An error message for the exception as a string */ - (OFString*)string; @end /** * The OFException class is the base class for all exceptions in ObjFW. * * IMPORTANT: Exceptions do NOT use OFAutoreleasePools!! */ @interface OFException: OFObject { Class class; OFString *string; } /** * Creates a new exception. * * \param class The class of the object which caused the exception * \return A new exception |
︙ | ︙ | |||
65 66 67 68 69 70 71 | /** * \return The class of the object in which the exception happened */ - (Class)inClass; /** | | | | 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 | /** * \return The class of the object in which the exception happened */ - (Class)inClass; /** * \return An error message for the exception as a string */ - (OFString*)string; @end /** * An OFException indicating there is not enough memory available. */ @interface OFNoMemException: OFException { |
︙ | ︙ | |||
217 218 219 220 221 222 223 | @end /** * An OFException indicating the file couldn't be opened. */ @interface OFOpenFileFailedException: OFException { | | | | | | | | | | | | | | | | 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 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 | @end /** * An OFException indicating the file couldn't be opened. */ @interface OFOpenFileFailedException: OFException { OFString *path; OFString *mode; int err; } /** * \param class The class of the object which caused the exception * \param path A string of the path to the file tried to open * \param mode A string of the mode in which the file should have been opened * \return A new open file failed exception */ + newWithClass: (Class)class andPath: (OFString*)path andMode: (OFString*)mode; /** * Initializes an already allocated open file failed exception. * * \param class The class of the object which caused the exception * \param path A string of the path to the file which couldn't be opened * \param mode A string of the mode in which the file should have been opened * \return An initialized open file failed exception */ - initWithClass: (Class)class andPath: (OFString*)path andMode: (OFString*)mode; /** * \return The errno from when the exception was created */ - (int)errNo; /** * \return A string of the path to the file which couldn't be opened */ - (OFString*)path; /** * \return A string of the mode in which the file should have been opened */ - (OFString*)mode; @end /** * An OFException indicating a read or write to the file failed. */ @interface OFReadOrWriteFailedException: OFException { |
︙ | ︙ | |||
363 364 365 366 367 368 369 | /** * An OFException indicating an attempt to connect or bind an already connected * or bound socket. */ @interface OFAlreadyConnectedException: OFException {} @end | < < < < < < | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 364 365 366 367 368 369 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 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 | /** * An OFException indicating an attempt to connect or bind an already connected * or bound socket. */ @interface OFAlreadyConnectedException: OFException {} @end /** * An OFException indicating the translation of an address failed. */ @interface OFAddressTranslationFailedException: OFException { OFString *node; OFString *service; int err; } /** * \param class The class of the object which caused the exception * \param node The node for which translation was requested * \param service The service of the node for which translation was requested * \return A new address translation failed exception */ + newWithClass: (Class)class andNode: (OFString*)node andService: (OFString*)service; /** * Initializes an already allocated address translation failed exception. * * \param class The class of the object which caused the exception * \param node The node for which translation was requested * \param service The service of the node for which translation was requested * \return An initialized address translation failed exception */ - initWithClass: (Class)class andNode: (OFString*)node andService: (OFString*)service; /** * \return The errno from when the exception was created */ - (int)errNo; /** * /return The node for which translation was requested */ - (OFString*)node; /** * \return The service of the node for which translation was requested */ - (OFString*)service; @end /** * An OFException indicating that the connection could not be established. */ @interface OFConnectionFailedException: OFException { OFString *node; OFString *service; int err; } /** * \param class The class of the object which caused the exception * \param node The node to which the connection failed * \param service The service on the node to which the connection failed * \return A new connection failed exception */ + newWithClass: (Class)class andNode: (OFString*)node andService: (OFString*)service; /** * Initializes an already allocated connection failed exception. * * \param class The class of the object which caused the exception * \param node The node to which the connection failed * \param service The service on the node to which the connection failed * \return An initialized connection failed exception */ - initWithClass: (Class)class andNode: (OFString*)node andService: (OFString*)service; /** * \return The errno from when the exception was created */ - (int)errNo; /** * \return The node to which the connection failed */ - (OFString*)node; /** * \return The service on the node to which the connection failed */ - (OFString*)service; @end /** * An OFException indicating that binding the socket failed. */ @interface OFBindFailedException: OFException { OFString *node; OFString *service; int family; int err; } /** * \param class The class of the object which caused the exception * \param node The node on which binding failed * \param service The service on which binding failed * \param family The family for which binnding failed * \return A new bind failed exception */ + newWithClass: (Class)class andNode: (OFString*)node andService: (OFString*)service andFamily: (int)family; /** * Initializes an already allocated bind failed exception. * * \param class The class of the object which caused the exception * \param node The node on which binding failed * \param service The service on which binding failed * \param family The family for which binnding failed * \return An initialized bind failed exception */ - initWithClass: (Class)class andNode: (OFString*)node andService: (OFString*)service andFamily: (int)family; /** * \return The errno from when the exception was created */ - (int)errNo; /** * \return The node on which binding failed */ - (OFString*)node; /** * \return The service on which binding failed */ - (OFString*)service; /** * \return The family for which binding failed */ - (int)family; @end |
︙ | ︙ |
Modified src/OFExceptions.m from [89c27be317] to [55ea187f4c].
︙ | ︙ | |||
47 48 49 50 51 52 53 | @implementation OFAllocFailedException + (Class)class { return self; } | | | | < | | | 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 | @implementation OFAllocFailedException + (Class)class { return self; } - (OFString*)string { return @"Allocating an object failed!"; } @end @implementation OFException + newWithClass: (Class)class_ { return [[self alloc] initWithClass: class_]; } - initWithClass: (Class)class_ { self = [super init]; class = class_; string = nil; return self; } - (void)dealloc { [string release]; [super dealloc]; } - (Class)inClass { return class; } - (OFString*)string { return string; } @end @implementation OFNoMemException + newWithClass: (Class)class_ |
︙ | ︙ | |||
106 107 108 109 110 111 112 | self = [super initWithClass: class_]; req_size = size; return self; } | | | > | | | 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 | self = [super initWithClass: class_]; req_size = size; return self; } - (OFString*)string { if (string != nil) return string; string = [[OFMutableString alloc] initWithFormat: @"Could not allocate %zu bytes in class %s!", req_size, [class name]]; return string; } - (size_t)requestedSize { return req_size; |
︙ | ︙ | |||
141 142 143 144 145 146 147 | self = [super initWithClass: class_]; pointer = ptr; return self; } | | | > | | > | | | 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 | self = [super initWithClass: class_]; pointer = ptr; return self; } - (OFString*)string { if (string != nil) return string; string = [[OFMutableString 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, [class name]]; return string; } - (void*)pointer { return pointer; |
︙ | ︙ | |||
178 179 180 181 182 183 184 | self = [super initWithClass: class_]; selector = selector_; return self; } | | | > | > | | | > | > | 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 | self = [super initWithClass: class_]; selector = selector_; return self; } - (OFString*)string { if (string != nil) return string; string = [[OFMutableString alloc] initWithFormat: @"The method %s of class %s is not or not fully " @"implemented!", SEL_NAME(selector), [class name]]; return string; } @end @implementation OFOutOfRangeException - (OFString*)string { if (string != nil) return string; string = [[OFMutableString alloc] initWithFormat: @"Value out of range in class %s!", [class name]]; return string; } @end @implementation OFInvalidArgumentException + newWithClass: (Class)class_ |
︙ | ︙ | |||
220 221 222 223 224 225 226 | self = [super initWithClass: class_]; selector = selector_; return self; } | | | > | > | | | > | | | | > | > | | > | > | | | | | | | < | < | | > | | > > | | | 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 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 300 301 302 303 304 305 306 307 308 309 310 311 312 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 | self = [super initWithClass: class_]; selector = selector_; return self; } - (OFString*)string { if (string != nil) return string; string = [[OFMutableString alloc] initWithFormat: @"The argument for method %s of class %s is " @"invalid!", SEL_NAME(selector), [class name]]; return string; } @end @implementation OFInvalidEncodingException - (OFString*)string { if (string != nil) return string; string = [[OFMutableString alloc] initWithFormat: @"The encoding is invalid for class %s!", [class name]]; return string; } @end @implementation OFInvalidFormatException - (OFString*)string { if (string != nil) return string; string = [[OFMutableString alloc] initWithFormat: @"The format is invalid for class %s!", [class name]]; return string; } @end @implementation OFInitializationFailedException - (OFString*)cString { if (string != nil) return string; string = [[OFMutableString alloc] initWithFormat: @"Initialization failed for class %s!", [class name]]; return string; } @end @implementation OFOpenFileFailedException + newWithClass: (Class)class_ andPath: (OFString*)path_ andMode: (OFString*)mode_ { return [[self alloc] initWithClass: class_ andPath: path_ andMode: mode_]; } - initWithClass: (Class)class_ andPath: (OFString*)path_ andMode: (OFString*)mode_ { self = [super initWithClass: class_]; path = [path_ retain]; mode = [mode_ retain]; err = GET_ERR; return self; } - (void)dealloc { [path release]; [mode release]; [super dealloc]; } - (OFString*)string { if (string != nil) return string; string = [[OFMutableString alloc] initWithFormat: @"Failed to open file %s with mode %s in class %s! " ERRFMT, [path cString], [mode cString], [self name], ERRPARAM]; return string; } - (int)errNo { return err; } - (OFString*)path { return path; } - (OFString*)mode { return mode; } @end @implementation OFReadOrWriteFailedException + newWithClass: (Class)class_ |
︙ | ︙ | |||
403 404 405 406 407 408 409 | - (BOOL)hasNItems { return has_items; } @end @implementation OFReadFailedException | | | > | > | | > | > | | | > | > | | > | > | | | > | | | | > | | | | > | | | < < < < < < < < < < < < | | | | | | | > > | > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | > | | | < < | | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 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 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 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 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 | - (BOOL)hasNItems { return has_items; } @end @implementation OFReadFailedException - (OFString*)string { if (string != nil) return string;; if (has_items) string = [[OFMutableString alloc] initWithFormat: @"Failed to read %zu items of size %zu in " @"class %s! " ERRFMT, req_items, req_size, [class name], ERRPARAM]; else string = [[OFMutableString alloc] initWithFormat: @"Failed to read %zu bytes in class %s! " ERRFMT, req_size, [class name], ERRPARAM]; return string; } @end @implementation OFWriteFailedException - (OFString*)string { if (string != nil) return string; if (has_items) string = [[OFMutableString alloc] initWithFormat: @"Failed to write %zu items of size %zu in " @"class %s! " ERRFMT, req_items, req_size, [class name], ERRPARAM]; else string = [[OFMutableString alloc] initWithFormat: @"Failed to write %zu bytes in class %s! " ERRFMT, req_size, [class name], ERRPARAM]; return string; } @end @implementation OFSetOptionFailedException - (OFString*)string { if (string != nil) return string; string = [[OFMutableString alloc] initWithFormat: @"Setting an option in class %s failed!", [class name]]; return string; } @end @implementation OFNotConnectedException - (OFString*)string { if (string != nil) return string; string = [[OFMutableString alloc] initWithFormat: @"The socket of type %s is not connected or bound!", [class name]]; return string; } @end @implementation OFAlreadyConnectedException - (OFString*)string { if (string != nil) return string; string = [[OFMutableString alloc] initWithFormat: @"The socket of type %s is already connected or " @"bound and thus can't be connected or bound " @"again!", [class name]]; return string; } @end @implementation OFAddressTranslationFailedException + newWithClass: (Class)class_ andNode: (OFString*)node_ andService: (OFString*)service_ { return [[self alloc] initWithClass: class_ andNode: node_ andService: service_]; } - initWithClass: (Class)class_ andNode: (OFString*)node_ andService: (OFString*)service_ { self = [super initWithClass: class_]; node = [node_ retain]; service = [service_ retain]; err = GET_SOCK_ERR; return self; } - (void)dealloc { [node release]; [service release]; [super dealloc]; } - (OFString*)string { if (string != nil) return string; string = [[OFMutableString 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], [class name], ERRPARAM]; return string; } - (int)errNo { return err; } - (OFString*)node { return node; } - (OFString*)service { return service; } @end @implementation OFConnectionFailedException + newWithClass: (Class)class_ andNode: (OFString*)node_ andService: (OFString*)service_ { return [[self alloc] initWithClass: class_ andNode: node_ andService: service_]; } - initWithClass: (Class)class_ andNode: (OFString*)node_ andService: (OFString*)service_ { self = [super initWithClass: class_]; node = [node_ retain]; service = [service_ retain]; err = GET_SOCK_ERR; return self; } - (void)dealloc { [node release]; [service release]; [super dealloc]; } - (OFString*)string { if (string != nil) return string; string = [[OFMutableString alloc] initWithFormat: @"A connection to service %s on node %s could not " @"be established in class %s! " ERRFMT, [node cString], [service cString], [class name], ERRPARAM]; return string; } - (int)errNo { return err; } - (OFString*)node { return node; } - (OFString*)service { return service; } @end @implementation OFBindFailedException + newWithClass: (Class)class_ andNode: (OFString*)node_ andService: (OFString*)service_ andFamily: (int)family_ { return [[self alloc] initWithClass: class_ andNode: node_ andService: service_ andFamily: family_]; } - initWithClass: (Class)class_ andNode: (OFString*)node_ andService: (OFString*)service_ andFamily: (int)family_ { self = [super initWithClass: class_]; node = [node_ retain]; service = [service_ retain]; family = family_; err = GET_SOCK_ERR; return self; } - (void)dealloc { [node release]; [service release]; [super dealloc]; } - (OFString*)string { if (string != nil) return string; string = [[OFMutableString alloc] initWithFormat: @"Binding service %s on node %s using family %d " @"failed in class %s! " ERRFMT, [service cString], [node cString], family, [class name], ERRPARAM]; return string; } - (int)errNo { return err; } - (OFString*)node { return node; } - (OFString*)service { return service; } - (int)family { return family; } @end |
︙ | ︙ | |||
699 700 701 702 703 704 705 | backlog = backlog_; err = GET_SOCK_ERR; return self; } | | | > | > | | 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 | backlog = backlog_; err = GET_SOCK_ERR; return self; } - (OFString*)string { if (string != nil) return string; string = [[OFMutableString alloc] initWithFormat: @"Failed to listen in socket of type %s with a " @"back log of %d! " ERRFMT, [class name], backlog, ERRPARAM]; return string; } - (int)errNo { return err; |
︙ | ︙ | |||
731 732 733 734 735 736 737 | self = [super initWithClass: class_]; err = GET_SOCK_ERR; return self; } | | | > | > | | | > | | > | | | > | | > | 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 | self = [super initWithClass: class_]; err = GET_SOCK_ERR; return self; } - (OFString*)string { if (string != nil) return string; string = [[OFMutableString alloc] initWithFormat: @"Failed to accept connection in socket of type " @"%s! " ERRFMT, [class name], ERRPARAM]; return string; } - (int)errNo { return err; } @end @implementation OFThreadJoinFailedException - (OFString*)string { if (string != nil) return string; string = [[OFMutableString alloc] initWithFormat: @"Joining a thread of class %s failed! Most " @"likely, another thread already waits for the " @"thread to join.", [class name]]; return string; } @end @implementation OFThreadCanceledException - (OFString*)string { if (string != nil) return string; string = [[OFMutableString alloc] initWithFormat: @"The requested action cannot be performed because " @"the thread of class %s was canceled!", [class name]]; return string; } @end |
Modified src/OFFile.h from [8b3e4349b5] to [0828962522].
︙ | ︙ | |||
15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 | #include <sys/types.h> #else typedef int uid_t; typedef int gid_t; #endif #import "OFStream.h" /** * The OFFile class provides functions to read, write and manipulate files. */ @interface OFFile: OFStream { FILE *fp; } /** | > | | | | | | | | | | | | | | | | | | | | | | | 15 16 17 18 19 20 21 22 23 24 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 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 | #include <sys/types.h> #else typedef int uid_t; typedef int gid_t; #endif #import "OFStream.h" #import "OFString.h" /** * The OFFile class provides functions to read, write and manipulate files. */ @interface OFFile: OFStream { FILE *fp; } /** * \param path The path to the file to open as a string * \param mode The mode in which the file should be opened as a string * \return A new autoreleased OFFile */ + fileWithPath: (OFString*)path andMode: (OFString*)mode; /** * Changes the mode of a file. * * Not available on Windows. * * \param path The path to the file of which the mode should be changed as a * string * \param mode The new mode for the file * \return A boolean whether the operation succeeded */ + (void)changeModeOfFile: (OFString*)path toMode: (mode_t)mode; /** * Changes the owner of a file. * * Not available on Windows. * * \param path The path to the file of which the owner should be changed as a * string * \param owner The new owner for the file * \param group The new group for the file * \return A boolean whether the operation succeeded */ + (void)changeOwnerOfFile: (OFString*)path toOwner: (uid_t)owner andGroup: (gid_t)group; /** * Deletes a file. * * \param path The path to the file of which should be deleted as a string * \return A boolean whether the operation succeeded */ + (void)delete: (OFString*)path; /** * Hardlinks a file. * * Not available on Windows. * * \param src The path to the file of which should be linked as a string * \param dest The path to where the file should be linked as a string * \return A boolean whether the operation succeeded */ + (void)link: (OFString*)src to: (OFString*)dest; /** * Symlinks a file. * * Not available on Windows. * * \param src The path to the file of which should be symlinked as a string * \param dest The path to where the file should be symlinked as a string * \return A boolean whether the operation succeeded */ + (void)symlink: (OFString*)src to: (OFString*)dest; /** * Initializes an already allocated OFFile. * * \param path The path to the file to open as a string * \param mode The mode in which the file should be opened as a string * \return An initialized OFFile */ - initWithPath: (OFString*)path andMode: (OFString*)mode; /** * \return A boolean whether the end of the file has been reached */ - (BOOL)atEndOfFile; /** |
︙ | ︙ |
Modified src/OFFile.m from [57318981b1] to [c917d0f228].
︙ | ︙ | |||
20 21 22 23 24 25 26 | #include <sys/stat.h> #endif #import "OFFile.h" #import "OFExceptions.h" @implementation OFFile | | | | | | | | | | | | | | | | | | | 20 21 22 23 24 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 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 | #include <sys/stat.h> #endif #import "OFFile.h" #import "OFExceptions.h" @implementation OFFile + fileWithPath: (OFString*)path andMode: (OFString*)mode { return [[[OFFile alloc] initWithPath: path andMode: mode] autorelease]; } + (void)changeModeOfFile: (OFString*)path toMode: (mode_t)mode { /* * FIXME: On error, throw exception * FIXME: On Win32, change write access */ #ifndef _WIN32 chmod([path cString], mode); #endif } + (void)changeOwnerOfFile: (OFString*)path toOwner: (uid_t)owner andGroup: (gid_t)group { /* FIXME: On error, throw exception */ #ifndef _WIN32 chown([path cString], owner, group); #endif } + (void)delete: (OFString*)path { /* FIXME: On error, throw exception */ unlink([path cString]); } + (void)link: (OFString*)src to: (OFString*)dest { /* FIXME: On error, throw exception */ #ifndef _WIN32 link([src cString], [dest cString]); #endif } + (void)symlink: (OFString*)src to: (OFString*)dest { /* FIXME: On error, throw exception */ #ifndef _WIN32 symlink([src cString], [dest cString]); #endif } - initWithPath: (OFString*)path andMode: (OFString*)mode { Class c; self = [super init]; if ((fp = fopen([path cString], [mode cString])) == NULL) { c = isa; [super dealloc]; @throw [OFOpenFileFailedException newWithClass: c andPath: path andMode: mode]; } |
︙ | ︙ |
Modified src/OFMutableString.h from [2f469f9606] to [0dde8a8b94].
︙ | ︙ | |||
30 31 32 33 34 35 36 | */ - initWithCString: (const char*)str; /** * Initializes an already allocated OFMutableString from a format C string. * See printf for the format syntax. * | | | | | | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 | */ - initWithCString: (const char*)str; /** * Initializes an already allocated OFMutableString from a format C string. * See printf for the format syntax. * * \param fmt A string used as format to initialize the OFMutableString * \return An initialized OFMutableString */ - initWithFormat: (OFString*)fmt, ...; /** * Initializes an already allocated OFMutableString from a format C string. * See printf for the format syntax. * * \param fmt A string used as format to initialize the OFMutableString * \param args The arguments used in the format string * \return An initialized OFMutableString */ - initWithFormat: (OFString*)fmt andArguments: (va_list)args; @end |
Modified src/OFMutableString.m from [f3d57089d4] to [a4955aa6db].
︙ | ︙ | |||
145 146 147 148 149 150 151 | } memcpy(string, str, length + 1); } return self; } | | | | | 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 | } memcpy(string, str, length + 1); } return self; } - initWithFormat: (OFString*)fmt, ... { id ret; va_list args; va_start(args, fmt); ret = [self initWithFormat: fmt andArguments: args]; va_end(args); return ret; } - initWithFormat: (OFString*)fmt andArguments: (va_list)args { int t; Class c; self = [super init]; if (fmt == NULL) { c = isa; [super dealloc]; @throw [OFInvalidFormatException newWithClass: c]; } if ((t = vasprintf(&string, [fmt cString], args)) == -1) { c = isa; [super dealloc]; @throw [OFInitializationFailedException newWithClass: c]; } length = t; switch (check_utf8(string, length)) { |
︙ | ︙ | |||
255 256 257 258 259 260 261 | toSize: length + strlength + 1]; memcpy(string + length, str, strlength + 1); length += strlength; return self; } | | | | | | | | 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 | toSize: length + strlength + 1]; memcpy(string + length, str, strlength + 1); length += strlength; return self; } - appendWithFormat: (OFString*)fmt, ... { id ret; va_list args; va_start(args, fmt); ret = [self appendWithFormat: fmt andArguments: args]; va_end(args); return ret; } - appendWithFormat: (OFString*)fmt andArguments: (va_list)args { char *t; if (fmt == NULL) @throw [OFInvalidFormatException newWithClass: isa]; if ((vasprintf(&t, [fmt cString], args)) == -1) /* * This is only the most likely error to happen. * Unfortunately, as errno isn't always thread-safe, there's * no good way for us to find out what really happened. */ @throw [OFNoMemException newWithClass: isa]; |
︙ | ︙ |
Modified src/OFPlugin.h from [2b644c907d] to [dcbe20abfe].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 | /* * Copyright (c) 2008 - 2009 * Jonathan Schleifer <js@webkeks.org> * * All rights reserved. * * This file is part of libobjfw. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE included in * the packaging of this file. */ #import "OFObject.h" /** * The OFPlugin class provides a system for loading plugins at runtime. */ @interface OFPlugin: OFObject { void *handle; } /** * Loads an OFPlugin from a file. * * \param path Path to the OFPlugin file. The suffix is appended automatically. * \return The loaded OFPlugin */ | > | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 | /* * Copyright (c) 2008 - 2009 * Jonathan Schleifer <js@webkeks.org> * * All rights reserved. * * This file is part of libobjfw. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE included in * the packaging of this file. */ #import "OFObject.h" #import "OFString.h" /** * The OFPlugin class provides a system for loading plugins at runtime. */ @interface OFPlugin: OFObject { void *handle; } /** * Loads an OFPlugin from a file. * * \param path Path to the OFPlugin file. The suffix is appended automatically. * \return The loaded OFPlugin */ + pluginFromFile: (OFString*)path; @end |
Modified src/OFPlugin.m from [0c45c3aa04] to [6ef03d99d0].
︙ | ︙ | |||
15 16 17 18 19 20 21 | #include <string.h> #include <dlfcn.h> #import "OFPlugin.h" #import "OFExceptions.h" @implementation OFPlugin | | | | | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 | #include <string.h> #include <dlfcn.h> #import "OFPlugin.h" #import "OFExceptions.h" @implementation OFPlugin + pluginFromFile: (OFString*)path { char *file; size_t pathlen, suffixlen; void *handle; OFPlugin *(*init_plugin)(); OFPlugin *plugin; pathlen = [path length]; suffixlen = strlen(PLUGIN_SUFFIX); if ((file = malloc(pathlen + suffixlen + 1)) == NULL) { @throw [OFNoMemException newWithClass: self andSize: pathlen + suffixlen + 1]; } memcpy(file, [path cString], pathlen); memcpy(file + pathlen, PLUGIN_SUFFIX, suffixlen); file[pathlen + suffixlen] = 0; if ((handle = dlopen(file, RTLD_NOW)) == NULL) { free(file); @throw [OFInitializationFailedException newWithClass: self]; } |
︙ | ︙ |
Modified src/OFStream.h from [b001002c07] to [29bc7e1e05].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | /* * Copyright (c) 2008 - 2009 * Jonathan Schleifer <js@webkeks.org> * * All rights reserved. * * This file is part of libobjfw. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE included in * the packaging of this file. */ #import "OFObject.h" /** * The OFStream class provides a base class for different types of streams. */ @interface OFStream: OFObject { char *cache; | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | /* * Copyright (c) 2008 - 2009 * Jonathan Schleifer <js@webkeks.org> * * All rights reserved. * * This file is part of libobjfw. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE included in * the packaging of this file. */ #import "OFObject.h" #import "OFString.h" /** * The OFStream class provides a base class for different types of streams. */ @interface OFStream: OFObject { char *cache; |
︙ | ︙ | |||
33 34 35 36 37 38 39 | /** * Read until a newline or \0 occurs. * * If you want to use readNBytes afterwards again, you have to clear the cache * before and optionally get the cache before clearing it! * | | | | | | | 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 | /** * Read until a newline or \0 occurs. * * If you want to use readNBytes afterwards again, you have to clear the cache * before and optionally get the cache before clearing it! * * \return The line that was read, autoreleased. */ - (OFString*)readLine; /** * Writes from a buffer into the stream. * * \param buf The buffer from which the data is written to the stream * \param size The size of the data that should be written * \return The number of bytes written */ - (size_t)writeNBytes: (size_t)size fromBuffer: (const char*)buf; /** * Writes a string into the stream, without the trailing zero. * * \param str The string from which the data is written to the stream * \return The number of bytes written */ - (size_t)writeString: (OFString*)str; /** * Sets a specified pointer to the cache and returns the length of the cache. * * \param ptr A pointer to a pointer. It will be set to the cache. * If it is NULL, only the number of bytes in the cache is returned. * \return The number of bytes in the cache. |
︙ | ︙ |
Modified src/OFStream.m from [37d8c8f6d5] to [755dcbeaa4].
︙ | ︙ | |||
34 35 36 37 38 39 40 | - (size_t)readNBytes: (size_t)size intoBuffer: (char*)buf { @throw [OFNotImplementedException newWithClass: isa andSelector: _cmd]; } | | | > | | | | > > > > > > | 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 | - (size_t)readNBytes: (size_t)size intoBuffer: (char*)buf { @throw [OFNotImplementedException newWithClass: isa andSelector: _cmd]; } - (OFString*)readLine { size_t i, len; char *ret_c, *tmp, *tmp2; OFString *ret; /* Look if there's a line or \0 in our cache */ if (cache != NULL) { for (i = 0; i < cache_len; i++) { if (OF_UNLIKELY(cache[i] == '\n' || cache[i] == '\0')) { ret_c = [self allocWithSize: i + 1]; memcpy(ret_c, cache, i); ret_c[i] = '\0'; @try { tmp = [self allocWithSize: cache_len - i - 1]; } @catch (OFException *e) { [self freeMem: ret_c]; @throw e; } memcpy(tmp, cache + i + 1, cache_len - i - 1); [self freeMem: cache]; cache = tmp; cache_len = cache_len - i - 1; @try { ret = [OFString stringWithCString: ret_c]; } @finally { [self freeMem: ret_c]; } return ret; } } } /* Read until we get a newline or \0 */ tmp = [self allocWithSize: getpagesize()]; |
︙ | ︙ | |||
82 83 84 85 86 87 88 | @throw e; } /* Look if there's a newline or \0 */ for (i = 0; i < len; i++) { if (OF_UNLIKELY(tmp[i] == '\n' || tmp[i] == '\0')) { @try { | | | | | | > > > > > > | 89 90 91 92 93 94 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 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 | @throw e; } /* Look if there's a newline or \0 */ for (i = 0; i < len; i++) { if (OF_UNLIKELY(tmp[i] == '\n' || tmp[i] == '\0')) { @try { ret_c = [self allocWithSize: cache_len + i + 1]; } @catch (OFException *e) { [self freeMem: tmp]; @throw e; } if (cache != NULL) memcpy(ret_c, cache, cache_len); memcpy(ret_c + cache_len, tmp, i); ret_c[i] = '\0'; if (i < len) { @try { tmp2 = [self allocWithSize: len - i - 1]; } @catch (OFException *e) { [self freeMem: ret_c]; [self freeMem: tmp]; @throw e; } memcpy(tmp2, tmp + i + 1, len - i - 1); if (cache != NULL) [self freeMem: cache]; cache = tmp2; cache_len = len - i - 1; } else { if (cache != NULL) [self freeMem: cache]; cache = NULL; cache_len = 0; } [self freeMem: tmp]; @try { ret = [OFString stringWithCString: ret_c]; } @finally { [self freeMem: ret_c]; } return ret; } } /* There was no newline or \0 */ @try { cache = [self resizeMem: cache |
︙ | ︙ | |||
140 141 142 143 144 145 146 | - (size_t)writeNBytes: (size_t)size fromBuffer: (const char*)buf { @throw [OFNotImplementedException newWithClass: isa andSelector: _cmd]; } | | | | | 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 | - (size_t)writeNBytes: (size_t)size fromBuffer: (const char*)buf { @throw [OFNotImplementedException newWithClass: isa andSelector: _cmd]; } - (size_t)writeString: (OFString*)str { return [self writeNBytes: [str length] fromBuffer: [str cString]]; } - (size_t)getCache: (char**)ptr { if (ptr != NULL) *ptr = cache; |
︙ | ︙ |
Modified src/OFString.h from [7948d30ca4] to [3cfd596b43].
︙ | ︙ | |||
44 45 46 47 48 49 50 | */ + stringWithCString: (const char*)str; /** * Creates a new OFMutableString from a format C string. * See printf for the format syntax. * | | | | | | 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 | */ + stringWithCString: (const char*)str; /** * Creates a new OFMutableString from a format C string. * See printf for the format syntax. * * \param fmt A string used as format to initialize the OFMutableString * \return A new autoreleased OFMutableString */ + stringWithFormat: (OFString*)fmt, ...; /** * Creates a new OFMutableString from a format C string. * See printf for the format syntax. * * \param fmt A string used as format to initialize the OFMutableString * \param args The arguments used in the format string * \return A new autoreleased OFMutableString */ + stringWithFormat: (OFString*)fmt andArguments: (va_list)args; /** * Initializes an already allocated OFString. * * \return An initialized OFString */ |
︙ | ︙ | |||
118 119 120 121 122 123 124 | */ - appendCString: (const char*)str; /** * Appends a formatted C string to the OFString. * See printf for the format syntax. * | | | | | | | 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 | */ - appendCString: (const char*)str; /** * Appends a formatted C string to the OFString. * See printf for the format syntax. * * \param fmt A format string which generates the string to append */ - appendWithFormat: (OFString*)fmt, ...; /** * Appends a formatted C string to the OFString. * See printf for the format syntax. * * \param fmt A format string which generates the string to append * \param args The arguments used in the format string */ - appendWithFormat: (OFString*)fmt andArguments: (va_list)args; /** * Reverse the OFString. */ - reverse; /** |
︙ | ︙ | |||
153 154 155 156 157 158 159 | /** * Splits an OFString into an OFArray of OFStrings. * * \param delimiter The delimiter for splitting * \return An autoreleased OFArray with the splitted string */ | | > > > | 153 154 155 156 157 158 159 160 161 162 163 164 | /** * Splits an OFString into an OFArray of OFStrings. * * \param delimiter The delimiter for splitting * \return An autoreleased OFArray with the splitted string */ - (OFArray*)splitWithDelimiter: (OFString*)delimiter; @end #import "OFConstString.h" #import "OFMutableString.h" |
Modified src/OFString.m from [5fed7eca62] to [dbcbcc49c8].
︙ | ︙ | |||
12 13 14 15 16 17 18 | #import "config.h" #include <stdarg.h> #include <stdlib.h> #include <string.h> #import "OFString.h" | < | | | 12 13 14 15 16 17 18 19 20 21 22 23 24 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 | #import "config.h" #include <stdarg.h> #include <stdlib.h> #include <string.h> #import "OFString.h" #import "OFAutoreleasePool.h" #import "OFExceptions.h" #import "OFMacros.h" @implementation OFString + string { return [[[OFMutableString alloc] init] autorelease]; } + stringWithCString: (const char*)str { return [[[OFMutableString alloc] initWithCString: str] autorelease]; } + stringWithFormat: (OFString*)fmt, ... { id ret; va_list args; va_start(args, fmt); ret = [[[OFMutableString alloc] initWithFormat: fmt andArguments: args] autorelease]; va_end(args); return ret; } + stringWithFormat: (OFString*)fmt andArguments: (va_list)args { return [[[OFMutableString alloc] initWithFormat: fmt andArguments: args] autorelease]; } - init |
︙ | ︙ | |||
123 124 125 126 127 128 129 | - appendCString: (const char*)str { @throw [OFNotImplementedException newWithClass: isa andSelector: _cmd]; } | | | | | 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 | - appendCString: (const char*)str { @throw [OFNotImplementedException newWithClass: isa andSelector: _cmd]; } - appendWithFormat: (OFString*)fmt, ... { @throw [OFNotImplementedException newWithClass: isa andSelector: _cmd]; } - appendWithFormat: (OFString*)fmt andArguments: (va_list)args { @throw [OFNotImplementedException newWithClass: isa andSelector: _cmd]; } - reverse { |
︙ | ︙ | |||
154 155 156 157 158 159 160 | - lower { @throw [OFNotImplementedException newWithClass: isa andSelector: _cmd]; } | | > | | | 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 | - lower { @throw [OFNotImplementedException newWithClass: isa andSelector: _cmd]; } - (OFArray*)splitWithDelimiter: (OFString*)delimiter { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; OFArray *array = nil; const char *delim = [delimiter cString]; size_t delim_len = [delimiter length]; size_t i, last; array = [OFArray array]; for (i = 0, last = 0; i <= length; i++) { if (OF_UNLIKELY(i == length || !memcmp(string + i, delim, delim_len))) { OFString *str; char *tmp; /* * We can't use [self allocWithSize:] here as * self might be a @""-literal. */ |
︙ | ︙ |
Modified src/OFTCPSocket.h from [2683abb6c9] to [f1ec44f94b].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 | /* * Copyright (c) 2008 - 2009 * Jonathan Schleifer <js@webkeks.org> * * All rights reserved. * * This file is part of libobjfw. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE included in * the packaging of this file. */ #import "OFSocket.h" /** * The OFTCPSocket class provides functions to create and use sockets. */ @interface OFTCPSocket: OFSocket {} /** * \return A new autoreleased OFTCPSocket */ + tcpSocket; /** * Initializes an already allocated OFTCPSocket. * * \return An initialized OFTCPSocket */ - init; /** * Connect the OFTCPSocket to the specified destination. * | > | | | | | | | | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 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 | /* * Copyright (c) 2008 - 2009 * Jonathan Schleifer <js@webkeks.org> * * All rights reserved. * * This file is part of libobjfw. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE included in * the packaging of this file. */ #import "OFSocket.h" #import "OFString.h" /** * The OFTCPSocket class provides functions to create and use sockets. */ @interface OFTCPSocket: OFSocket {} /** * \return A new autoreleased OFTCPSocket */ + tcpSocket; /** * Initializes an already allocated OFTCPSocket. * * \return An initialized OFTCPSocket */ - init; /** * Connect the OFTCPSocket to the specified destination. * * \param service The service on the node to connect to * \param node The node to connect to */ - connectToService: (OFString*)service onNode: (OFString*)node; /** * Bind socket on the specified node and service. * * \param service The service to bind * \param node The node to bind to * \param protocol The protocol to use (AF_INET or AF_INET6) */ - bindService: (OFString*)service onNode: (OFString*)node withFamily: (int)family; /** * Listen on the socket. * * \param backlog Maximum length for the queue of pending connections. */ - listenWithBackLog: (int)backlog; |
︙ | ︙ |
Modified src/OFTCPSocket.m from [713f66fbf8] to [9556eafe3a].
︙ | ︙ | |||
43 44 45 46 47 48 49 | { if (sock != INVALID_SOCKET) close(sock); [super dealloc]; } | | | < < < < < | < | | | | | | | < < < < | | < | < | | | | | 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 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 126 127 128 | { if (sock != INVALID_SOCKET) close(sock); [super dealloc]; } - connectToService: (OFString*)service onNode: (OFString*)node { struct addrinfo hints, *res, *res0; if (sock != INVALID_SOCKET) @throw [OFAlreadyConnectedException newWithClass: isa]; memset(&hints, 0, sizeof(struct addrinfo)); hints.ai_family = AF_UNSPEC; hints.ai_socktype = SOCK_STREAM; if (getaddrinfo([node cString], [service cString], &hints, &res0)) @throw [OFAddressTranslationFailedException newWithClass: isa andNode: node andService: service]; for (res = res0; res != NULL; res = res->ai_next) { if ((sock = socket(res->ai_family, res->ai_socktype, res->ai_protocol)) == INVALID_SOCKET) continue; if (connect(sock, res->ai_addr, res->ai_addrlen) == -1) { close(sock); sock = INVALID_SOCKET; continue; } break; } freeaddrinfo(res0); if (sock == INVALID_SOCKET) @throw [OFConnectionFailedException newWithClass: isa andNode: node andService: service]; return self; } - bindService: (OFString*)service onNode: (OFString*)node withFamily: (int)family { struct addrinfo hints, *res; if (sock != INVALID_SOCKET) @throw [OFAlreadyConnectedException newWithClass: isa]; if ((sock = socket(family, SOCK_STREAM, 0)) == INVALID_SOCKET) @throw [OFBindFailedException newWithClass: isa andNode: node andService: service andFamily: family]; memset(&hints, 0, sizeof(struct addrinfo)); hints.ai_family = family; hints.ai_socktype = SOCK_STREAM; if (getaddrinfo([node cString], [service cString], &hints, &res)) @throw [OFAddressTranslationFailedException newWithClass: isa andNode: node andService: service]; if (bind(sock, res->ai_addr, res->ai_addrlen) == -1) { freeaddrinfo(res); @throw [OFBindFailedException newWithClass: isa andNode: node andService: service andFamily: family]; } freeaddrinfo(res); return self; } |
︙ | ︙ |
Modified tests/OFDataArray/OFDataArray.m from [9fd6b5cc0c] to [ebf9c80b5a].
︙ | ︙ | |||
24 25 26 27 28 29 30 | @try { \ code; \ \ puts("NOT CAUGHT!"); \ return 1; \ } @catch (exception *e) { \ puts("CAUGHT! Error string was:"); \ | | | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 | @try { \ code; \ \ puts("NOT CAUGHT!"); \ return 1; \ } @catch (exception *e) { \ puts("CAUGHT! Error string was:"); \ puts([[e string] cString]); \ puts("Resuming..."); \ } const char *str = "Hallo!"; #define TEST(type) \ puts("Trying to add too much to an array..."); \ |
︙ | ︙ |
Modified tests/OFDictionary/OFDictionary.m from [3731d42c29] to [871e28ae32].
︙ | ︙ | |||
13 14 15 16 17 18 19 | #include <stdio.h> #include <string.h> #import "OFAutoreleasePool.h" #import "OFDictionary.h" #import "OFIterator.h" | < | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 | #include <stdio.h> #include <string.h> #import "OFAutoreleasePool.h" #import "OFDictionary.h" #import "OFIterator.h" #import "OFString.h" #import "OFExceptions.h" int main() { OFDictionary *dict = [OFDictionary dictionaryWithHashSize: 16]; |
︙ | ︙ |
Modified tests/OFHashes/OFHashes.m from [0de7e8a2b0] to [4ae6911129].
︙ | ︙ | |||
27 28 29 30 31 32 33 | main() { char buf[64]; size_t len; OFMD5Hash *md5 = [OFMD5Hash md5Hash]; OFSHA1Hash *sha1 = [OFSHA1Hash sha1Hash]; | | | | 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | main() { char buf[64]; size_t len; OFMD5Hash *md5 = [OFMD5Hash md5Hash]; OFSHA1Hash *sha1 = [OFSHA1Hash sha1Hash]; OFFile *f = [OFFile fileWithPath: @"testfile" andMode: @"rb"]; while (![f atEndOfFile]) { len = [f readNBytes: 64 intoBuffer: buf]; [md5 updateWithBuffer: buf ofSize: len]; [sha1 updateWithBuffer: buf |
︙ | ︙ |
Modified tests/OFObject/OFObject.m from [020015e81a] to [80756659a6].
︙ | ︙ | |||
22 23 24 25 26 27 28 | @try { \ code; \ \ puts("NOT CAUGHT!"); \ return 1; \ } @catch (exception *e) { \ puts("CAUGHT! Error string was:"); \ | | | 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 | @try { \ code; \ \ puts("NOT CAUGHT!"); \ return 1; \ } @catch (exception *e) { \ puts("CAUGHT! Error string was:"); \ puts([[e string] cString]); \ puts("Resuming..."); \ } int main() { OFObject *obj = [[OFObject alloc] init]; |
︙ | ︙ |
Modified tests/OFPlugin/OFPlugin.m from [4ca81ff021] to [dfdf5ba72e].
︙ | ︙ | |||
17 18 19 20 21 22 23 | #import "TestPlugin/TestPlugin.h" int main() { TestPlugin *plugin; | | | 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 | #import "TestPlugin/TestPlugin.h" int main() { TestPlugin *plugin; plugin = [OFPlugin pluginFromFile: @"TestPlugin/TestPlugin"]; if ([plugin test: 1234] != 2468) { puts("\033[K\033[1;31mTest 1/1 failed!\033[m"); return 1; } puts("\033[1;32mTests successful: 1/1\033[0m"); return 0; } |
Modified tests/OFString/OFString.m from [a3755365c5] to [3302635bae].
︙ | ︙ | |||
11 12 13 14 15 16 17 | #import "config.h" #include <stdio.h> #include <string.h> #import "OFString.h" | < | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | #import "config.h" #include <stdio.h> #include <string.h> #import "OFString.h" #import "OFArray.h" #import "OFAutoreleasePool.h" #import "OFExceptions.h" #ifndef _WIN32 #define ZD "%zd" #else |
︙ | ︙ | |||
66 67 68 69 70 71 72 | s3 = [s1 copy]; CHECK([s1 isEqual: s3]) CHECK(![s1 isEqual: [[OFObject alloc] init]]) CHECK([s1 hash] == [s3 hash]) | | > | 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 | s3 = [s1 copy]; CHECK([s1 isEqual: s3]) CHECK(![s1 isEqual: [[OFObject alloc] init]]) CHECK([s1 hash] == [s3 hash]) [s2 appendCString: "12"]; [s2 append: @"3"]; [s4 setTo: [s2 cString]]; CHECK(![s2 compare: s4]) CHECK(!strcmp([[s1 append: s2] cString], "test123")) CHECK([s1 hash] == 0xC44F49A4) CHECK(strlen([s1 cString]) == [s1 length] && [s1 length] == 7) CHECK(!strcmp([[s1 reverse] cString], "321tset")) |
︙ | ︙ | |||
91 92 93 94 95 96 97 | OFInvalidEncodingException) s1 = [OFString stringWithCString: "äöü€𝄞"]; CHECK(!strcmp([[s1 reverse] cString], "𝄞€üöä")) [s1 dealloc]; /* Format tests */ | | | | | 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 | OFInvalidEncodingException) s1 = [OFString stringWithCString: "äöü€𝄞"]; CHECK(!strcmp([[s1 reverse] cString], "𝄞€üöä")) [s1 dealloc]; /* Format tests */ s1 = [OFString stringWithFormat: @"%s: %d", "test", 123]; CHECK(!strcmp([s1 cString], "test: 123")) [s1 appendWithFormat: @"%02X", 15]; CHECK(!strcmp([s1 cString], "test: 1230F")) a = [@"fooXXbarXXXXbazXXXX" splitWithDelimiter: @"XX"]; CHECK([[a object: j++] isEqual: @"foo"]) CHECK([[a object: j++] isEqual: @"bar"]) CHECK([[a object: j++] isEqual: @""]) CHECK([[a object: j++] isEqual: @"baz"]) CHECK([[a object: j++] isEqual: @""]) CHECK([[a object: j++] isEqual: @""]) puts(""); return 0; } |
Modified tests/OFTCPSocket/OFTCPSocket.m from [a265aae238] to [2d157422ed].
︙ | ︙ | |||
31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 | return port; } int main() { uint16_t port; srand(time(NULL)); @try { OFTCPSocket *server = [OFTCPSocket tcpSocket]; OFTCPSocket *client = [OFTCPSocket tcpSocket]; OFTCPSocket *accepted; char buf[7]; puts("== IPv4 =="); port = get_port(); | > > | | | | | | > | | | | | | | | 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 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 | return port; } int main() { uint16_t port; OFString *service; srand(time(NULL)); @try { OFTCPSocket *server = [OFTCPSocket tcpSocket]; OFTCPSocket *client = [OFTCPSocket tcpSocket]; OFTCPSocket *accepted; char buf[7]; puts("== IPv4 =="); port = get_port(); service = [OFString stringWithFormat: @"%d", port]; [server bindService: service onNode: @"localhost" withFamily: AF_INET]; [server listen]; [client connectToService: service onNode: @"localhost"]; accepted = [server accept]; [client writeString: @"Hallo!"]; [accepted readNBytes: 6 intoBuffer: buf]; buf[6] = 0; if (!strcmp(buf, "Hallo!")) puts("Received correct string!"); else { puts("Received INCORRECT string!"); return 1; } #ifdef HAVE_IPV6 memset(buf, 0, 7); [accepted release]; [client close]; [server close]; puts("== IPv6 =="); port = get_port(); service = [OFString stringWithFormat: @"%d", port]; [server bindService: service onNode: @"::1" withFamily: AF_INET6]; [server listen]; [client connectToService: service onNode: @"::1"]; accepted = [server accept]; [client writeString: @"IPv6:)"]; [accepted readNBytes: 6 intoBuffer: buf]; buf[6] = 0; if (!strcmp(buf, "IPv6:)")) puts("Received correct string!"); else { puts("Received INCORRECT string!"); return 1; } #endif [accepted release]; } @catch (OFException *e) { printf("EXCEPTION: %s\n", [[e string] cString]); return 1; } return 0; } |
Modified tests/OFThread/OFThread.m from [dfe628bf94] to [970ee61a34].
︙ | ︙ | |||
10 11 12 13 14 15 16 | */ #import "config.h" #include <stdio.h> #import "OFThread.h" | | | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | */ #import "config.h" #include <stdio.h> #import "OFThread.h" #import "OFString.h" @interface MyThread: OFThread @end @implementation MyThread - main { |
︙ | ︙ |