Changes In Branch 0.5 Excluding Merge-Ins
This is equivalent to a diff from 91d438b5d2 to 1512d853e7
|
2012-02-20
| ||
| 22:43 | Close 0.5 branch, as it is no longer maintained. (Closed-Leaf check-in: 1512d853e7 user: js tags: 0.5) | |
|
2011-09-06
| ||
| 11:42 | Fix handling of nested namespaces in OFXMLElement. (check-in: 55599756ab user: js tags: 0.5) | |
|
2011-04-09
| ||
| 15:41 | OFXMLParser: Don't allow character data before the document. (check-in: 0cc997a1d7 user: js tags: trunk) | |
| 12:31 | Branch for 0.5. (check-in: 5203170e82 user: js tags: 0.5) | |
| 12:30 | Also test comments in -[stringValue]. (check-in: 91d438b5d2 user: js tags: trunk) | |
|
2011-04-08
| ||
| 07:05 | Add -[isListening] to OFTCPSocket. (check-in: 054a38e82d user: js tags: trunk) | |
Modified ChangeLog from [f70c6798b5] to [6f581b20cf].
1 2 3 4 5 6 7 8 9 10 11 | Legend: * Changes of existing features or bugfixes. + New features. ObjFW 0.3.1 -> 0.4-alpha1, 03.01.2011 * ObjFW is now available under the terms of the QPL, GPLv2 and GPLv3. + Support for blocks was added, including a blocks runtime. + Added support for the new GNU runtime, introduced in GCC 4.6. * Objects returned from collections are no longer retained and autoreleased. + Added new classes OFXMLParser, OFXMLElement, OFXMLAttribute and OFXMLElementBuilder. | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 57 58 |
Legend:
* Changes of existing features or bugfixes.
+ New features.
ObjFW 0.5.3 -> ObjFW 0.5.4, 30.08.2011
* The blocks runtime is now working correctly.
* Documentation fixes.
* -framework works with objfw-compile now.
+ Support for QNX.
* Various small fixes.
ObjFW 0.5.2 -> ObjFW 0.5.3, 01.07.2011
* Lots of bugfixes, see Mercurial log for details. (hg log -b 0.5)
ObjFW 0.5.1 -> ObjFW 0.5.2, 25.04.2011
* Fix double-retain in OFList.
* Don't ignore the timeout in OFStreamObserver when using select().
* Do -[OFURL copy] in a try block to prevent a leak when an exception occurs.
* Fix too big buffer in -[OFMutableString _applyTable:withSize:].
* Call madvise() on the correct length variable so it covers the whole string.
* Fix a warning when sizeof(size_t) < sizeof(long long).
* Skip possible BOMs when appending strings.
ObjFW 0.5 -> ObjFW 0.5.1, 21.04.2011
* Work around a wrong warning produced by Apple GCC 4.0.1 which would cause
the build to fail due to -Werror.
* Call objc_thread_{add,remove} when using the GNU runtime to make sure the
runtime knows about our thread.
* Detach a thread before restarting if it was never joined.
* Release the old return value when restarting a thread.
ObjFW 0.4-alpha1 -> 0.5, 09.04.2011
+ %@ is now allowed in format strings.
+ Added of_log for easy logging.
* Exceptions have one header per exception now.
* Lots of exception improvements.
* Huge improvements in XML handling.
* Improvements in socket handling, including improved API.
* OFStreamObserver is now thread-safe and stops the current observe call when
the set of streams to observe is modified.
+ New class OFURL.
+ New class OFHTTPRequest.
+ New class OFCondition.
* Improvements in objfw-compile.
+ Blocks can be used together with Cocoa now.
+ When linking ObjFW and Cocoa, OFAutoreleasePools are used by both now.
+ Support for Base64.
+ Use a real Xcode project instead of just calling make.
+ Add Haiku to the list of supported platforms.
* Lots of small bugfixes and countless small changes. Read the commits!
ObjFW 0.3.1 -> 0.4-alpha1, 03.01.2011
* ObjFW is now available under the terms of the QPL, GPLv2 and GPLv3.
+ Support for blocks was added, including a blocks runtime.
+ Added support for the new GNU runtime, introduced in GCC 4.6.
* Objects returned from collections are no longer retained and autoreleased.
+ Added new classes OFXMLParser, OFXMLElement, OFXMLAttribute and
OFXMLElementBuilder.
|
| ︙ | ︙ |
Modified Info.plist from [2784921274] to [965c6eb890].
| ︙ | ︙ | |||
13 14 15 16 17 18 19 | <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundlePackageType</key> <string>FMWK</string> <key>CFBundleSignature</key> <string>OBJFW</string> <key>CFBundleVersion</key> | | | | 13 14 15 16 17 18 19 20 21 22 23 24 | <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundlePackageType</key> <string>FMWK</string> <key>CFBundleSignature</key> <string>OBJFW</string> <key>CFBundleVersion</key> <string>0.5.4</string> <key>CFBundleShortVersionString</key> <string>0.5.4</string> </dict> </plist> |
Modified ObjFW.xcodeproj/project.pbxproj from [184f3ea38a] to [07b998400f].
| ︙ | ︙ | |||
188 189 190 191 192 193 194 |
4B3D23EE1337FFD000DD29B8 /* of_asprintf.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BB50DD012F863C700C9393F /* of_asprintf.m */; };
4B55A0FF133ABEA900B58A93 /* OFThreadJoinFailedException.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B55A0F9133ABEA900B58A93 /* OFThreadJoinFailedException.h */; settings = {ATTRIBUTES = (Public, ); }; };
4B55A100133ABEA900B58A93 /* OFThreadJoinFailedException.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B55A0FA133ABEA900B58A93 /* OFThreadJoinFailedException.m */; };
4B55A101133ABEA900B58A93 /* OFThreadStartFailedException.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B55A0FB133ABEA900B58A93 /* OFThreadStartFailedException.h */; settings = {ATTRIBUTES = (Public, ); }; };
4B55A102133ABEA900B58A93 /* OFThreadStartFailedException.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B55A0FC133ABEA900B58A93 /* OFThreadStartFailedException.m */; };
4B55A103133ABEA900B58A93 /* OFThreadStillRunningException.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B55A0FD133ABEA900B58A93 /* OFThreadStillRunningException.h */; settings = {ATTRIBUTES = (Public, ); }; };
4B55A104133ABEA900B58A93 /* OFThreadStillRunningException.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B55A0FE133ABEA900B58A93 /* OFThreadStillRunningException.m */; };
| | | 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 |
4B3D23EE1337FFD000DD29B8 /* of_asprintf.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BB50DD012F863C700C9393F /* of_asprintf.m */; };
4B55A0FF133ABEA900B58A93 /* OFThreadJoinFailedException.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B55A0F9133ABEA900B58A93 /* OFThreadJoinFailedException.h */; settings = {ATTRIBUTES = (Public, ); }; };
4B55A100133ABEA900B58A93 /* OFThreadJoinFailedException.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B55A0FA133ABEA900B58A93 /* OFThreadJoinFailedException.m */; };
4B55A101133ABEA900B58A93 /* OFThreadStartFailedException.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B55A0FB133ABEA900B58A93 /* OFThreadStartFailedException.h */; settings = {ATTRIBUTES = (Public, ); }; };
4B55A102133ABEA900B58A93 /* OFThreadStartFailedException.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B55A0FC133ABEA900B58A93 /* OFThreadStartFailedException.m */; };
4B55A103133ABEA900B58A93 /* OFThreadStillRunningException.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B55A0FD133ABEA900B58A93 /* OFThreadStillRunningException.h */; settings = {ATTRIBUTES = (Public, ); }; };
4B55A104133ABEA900B58A93 /* OFThreadStillRunningException.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B55A0FE133ABEA900B58A93 /* OFThreadStillRunningException.m */; };
4B55A109133AC05100B58A93 /* common.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B55A106133AC05100B58A93 /* common.h */; settings = {ATTRIBUTES = (Public, ); }; };
4B55A10A133AC05100B58A93 /* OFOpenFileFailedException.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B55A107133AC05100B58A93 /* OFOpenFileFailedException.h */; settings = {ATTRIBUTES = (Public, ); }; };
4B55A10B133AC05100B58A93 /* OFOpenFileFailedException.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B55A108133AC05100B58A93 /* OFOpenFileFailedException.m */; };
4B55A112133AC24600B58A93 /* OFReadFailedException.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B55A10C133AC24500B58A93 /* OFReadFailedException.h */; settings = {ATTRIBUTES = (Public, ); }; };
4B55A113133AC24600B58A93 /* OFReadFailedException.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B55A10D133AC24500B58A93 /* OFReadFailedException.m */; };
4B55A114133AC24600B58A93 /* OFReadOrWriteFailedException.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B55A10E133AC24500B58A93 /* OFReadOrWriteFailedException.h */; settings = {ATTRIBUTES = (Public, ); }; };
4B55A115133AC24600B58A93 /* OFReadOrWriteFailedException.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B55A10F133AC24500B58A93 /* OFReadOrWriteFailedException.m */; };
4B55A116133AC24600B58A93 /* OFWriteFailedException.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B55A110133AC24500B58A93 /* OFWriteFailedException.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
| ︙ | ︙ | |||
251 252 253 254 255 256 257 |
4BF33B0C133807A20059CEF7 /* OFThreadTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6EF67B1235358D0076B512 /* OFThreadTests.m */; };
4BF33B0D133807A20059CEF7 /* OFURLTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BF0749512DFAFCA00A4ADD1 /* OFURLTests.m */; };
4BF33B0E133807A20059CEF7 /* OFXMLElementBuilderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6EF67C1235358D0076B512 /* OFXMLElementBuilderTests.m */; };
4BF33B0F133807A20059CEF7 /* OFXMLElementTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6EF67D1235358D0076B512 /* OFXMLElementTests.m */; };
4BF33B10133807A20059CEF7 /* OFXMLParserTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6EF67E1235358D0076B512 /* OFXMLParserTests.m */; };
4BF33B11133807A20059CEF7 /* PropertiesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6EF67F1235358D0076B512 /* PropertiesTests.m */; };
4BF33B12133807A20059CEF7 /* TestsAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6EF6811235358D0076B512 /* TestsAppDelegate.m */; };
| < < | 251 252 253 254 255 256 257 258 259 260 261 262 263 264 |
4BF33B0C133807A20059CEF7 /* OFThreadTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6EF67B1235358D0076B512 /* OFThreadTests.m */; };
4BF33B0D133807A20059CEF7 /* OFURLTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BF0749512DFAFCA00A4ADD1 /* OFURLTests.m */; };
4BF33B0E133807A20059CEF7 /* OFXMLElementBuilderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6EF67C1235358D0076B512 /* OFXMLElementBuilderTests.m */; };
4BF33B0F133807A20059CEF7 /* OFXMLElementTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6EF67D1235358D0076B512 /* OFXMLElementTests.m */; };
4BF33B10133807A20059CEF7 /* OFXMLParserTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6EF67E1235358D0076B512 /* OFXMLParserTests.m */; };
4BF33B11133807A20059CEF7 /* PropertiesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6EF67F1235358D0076B512 /* PropertiesTests.m */; };
4BF33B12133807A20059CEF7 /* TestsAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6EF6811235358D0076B512 /* TestsAppDelegate.m */; };
4BF33B4713380CE20059CEF7 /* testfile.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4BF33B4313380CD40059CEF7 /* testfile.txt */; };
4BF33B4813380D2D0059CEF7 /* testfile.bin in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4BF33B4213380CD40059CEF7 /* testfile.bin */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
4B23CA8E133811B20047A1D9 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
|
| ︙ | ︙ | |||
1020 1021 1022 1023 1024 1025 1026 | 4B17FFA9133A34E7003E6DCD /* OFTruncatedDataException.h in Headers */, 4B17FFB5133A375B003E6DCD /* OFUnboundNamespaceException.h in Headers */, 4B17FFB1133A3664003E6DCD /* OFUnsupportedProtocolException.h in Headers */, 4B55A0FF133ABEA900B58A93 /* OFThreadJoinFailedException.h in Headers */, 4B55A101133ABEA900B58A93 /* OFThreadStartFailedException.h in Headers */, 4B55A103133ABEA900B58A93 /* OFThreadStillRunningException.h in Headers */, 4B55A116133AC24600B58A93 /* OFWriteFailedException.h in Headers */, | < > | 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 |
4B17FFA9133A34E7003E6DCD /* OFTruncatedDataException.h in Headers */,
4B17FFB5133A375B003E6DCD /* OFUnboundNamespaceException.h in Headers */,
4B17FFB1133A3664003E6DCD /* OFUnsupportedProtocolException.h in Headers */,
4B55A0FF133ABEA900B58A93 /* OFThreadJoinFailedException.h in Headers */,
4B55A101133ABEA900B58A93 /* OFThreadStartFailedException.h in Headers */,
4B55A103133ABEA900B58A93 /* OFThreadStillRunningException.h in Headers */,
4B55A116133AC24600B58A93 /* OFWriteFailedException.h in Headers */,
4B55A109133AC05100B58A93 /* common.h in Headers */,
4BDF37B51338055600F9A81A /* config.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */
4B23CA89133811610047A1D9 /* TestPlugin */ = {
|
| ︙ | ︙ | |||
1120 1121 1122 1123 1124 1125 1126 |
/* End PBXProject section */
/* Begin PBXResourcesBuildPhase section */
4B3D23741337FBC800DD29B8 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
| < < | 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 |
/* End PBXProject section */
/* Begin PBXResourcesBuildPhase section */
4B3D23741337FBC800DD29B8 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
4B5D8DE11099E1BF000896FF /* ShellScript */ = {
|
| ︙ | ︙ |
Modified PLATFORMS from [2a581e910f] to [fcddfeebcb].
| ︙ | ︙ | |||
20 21 22 23 24 25 26 | | Mac OS X 10.5 - 10.6 | x86 | GCC 4.0 + 4.2 | Apple | | Mac OS X 10.5 - 10.6 | x86_64 | GCC 4.0 + 4.2 | Apple | +--------------------------+--------------+----------------------+---------+ | MirBSD 10uAB - 10uAD | x86 | GCC 4.4.2 | old GNU | | MirBSD 10uAD | x86 | LLVM/Clang r90573 | old GNU | +--------------------------+--------------+----------------------+---------+ | NetBSD 4.0 | x86 | GCC 4.1.2 prerelease | old GNU | | | | | > > | | 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 | | Mac OS X 10.5 - 10.6 | x86 | GCC 4.0 + 4.2 | Apple | | Mac OS X 10.5 - 10.6 | x86_64 | GCC 4.0 + 4.2 | Apple | +--------------------------+--------------+----------------------+---------+ | MirBSD 10uAB - 10uAD | x86 | GCC 4.4.2 | old GNU | | MirBSD 10uAD | x86 | LLVM/Clang r90573 | old GNU | +--------------------------+--------------+----------------------+---------+ | NetBSD 4.0 | x86 | GCC 4.1.2 prerelease | old GNU | | NetBSD 5.1 | x86_64 | GCC 4.1.3 prerelease | old GNU | | NetBSD 5.1 | x86_64 | GCC 4.6 | GNU | | NetBSD 5.1 | x86_64 | LLVM/Clang r134860 | old GNU | +--------------------------+--------------+----------------------+---------+ | OpenBSD 4.6 - 4.7 | x86_64 | GCC 4.2.1 - 4.2.4 | old GNU | +--------------------------+--------------+----------------------+---------+ | OpenSolaris 2009.06 | x86 | | old GNU | | OpenSolaris 2009.06 | x86_64 | | old GNU | +--------------------------+--------------+----------------------+---------+ | QNX 6.5.0 | x86 | GCC 4.6.1 | GNU | +--------------------------+--------------+----------------------+---------+ | Windows XP - 7 / Cygwin | x86 | | old GNU | | Windows XP - 7 / MinGW32 | x86 | | old GNU | | Windows 7 / MinGW64 | x86_64 | | old GNU | +--------------------------+--------------+----------------------+---------+ Basically, it should run on any POSIX system to which GCC 4 or a recent Clang version has been ported. If not, please send an e-mail with a bug report. |
Modified README from [2bffcb61ce] to [02fd1965be].
| ︙ | ︙ | |||
20 21 22 23 24 25 26 |
$ ./autogen.sh
BUILDING AS A MAC OS X FRAMEWORK
It is also possible to build ObjFW as a Mac OS X framework. To do so,
| | | | | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 |
$ ./autogen.sh
BUILDING AS A MAC OS X FRAMEWORK
It is also possible to build ObjFW as a Mac OS X framework. To do so,
just execute xcodebuild -target ObjFW in the root directory of ObjFW or open
the .xcodeproj in Xcode and choose Build -> Build from the menu. Copy the
resulting ObjFW.framework to /Library/Frameworks and you are done.
USING THE MAC OS X FRAMEWORK IN XCODE
To use the Mac OS X framework in Xcode, you need to add the .framework
to your project and add the following flags to "Other C Flags":
-fconstant-string-class=OFConstantString -fno-constant-cfstrings
Additionally, since Xcode 4, you need to manually set the compiler to GCC
|
| ︙ | ︙ |
Modified configure.ac from [c2f04c07fa] to [7f3d147b20].
|
| | | 1 2 3 4 5 6 7 8 | AC_INIT(ObjFW, 0.5.4, js@webkeks.org) AC_CONFIG_SRCDIR(src) AS_IF([test x"$host" = x"psp"], [ OBJCFLAGS="-G0 $OBJCFLAGS" LIBS="$LIBS -lpspdebug -lpspdisplay -lpspge -lpspctrl -lpspsdk -lc" LIBS="$LIBS -lpspnet -lpspnet_inet -lpspnet_apctl -lpspnet_resolver" LIBS="$LIBS -lpsputility -lpspuser -lpspkernel" |
| ︙ | ︙ | |||
25 26 27 28 29 30 31 | AX_CHECK_COMPILER_FLAGS(-std=gnu99, [OBJCFLAGS="$OBJCFLAGS -std=gnu99"]) AX_CHECK_COMPILER_FLAGS(-pipe, [OBJCFLAGS="$OBJCFLAGS -pipe"]) AX_CHECK_COMPILER_FLAGS(-fno-common, [OBJCFLAGS="$OBJCFLAGS -fno-common"]) AX_CHECK_COMPILER_FLAGS(-fno-constant-cfstrings, [ NO_CONST_CFSTRINGS="-fno-constant-cfstrings" OBJCFLAGS="$OBJCFLAGS -fno-constant-cfstrings" ]) | | > | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 | AX_CHECK_COMPILER_FLAGS(-std=gnu99, [OBJCFLAGS="$OBJCFLAGS -std=gnu99"]) AX_CHECK_COMPILER_FLAGS(-pipe, [OBJCFLAGS="$OBJCFLAGS -pipe"]) AX_CHECK_COMPILER_FLAGS(-fno-common, [OBJCFLAGS="$OBJCFLAGS -fno-common"]) AX_CHECK_COMPILER_FLAGS(-fno-constant-cfstrings, [ NO_CONST_CFSTRINGS="-fno-constant-cfstrings" OBJCFLAGS="$OBJCFLAGS -fno-constant-cfstrings" ]) AX_CHECK_COMPILER_FLAGS(-Wshorten-64-to-32, [OBJCFLAGS="$OBJCFLAGS -Wshorten-64-to-32"]) AC_SUBST(NO_CONST_CFSTRINGS) AC_MSG_CHECKING(whether Objective C compiler supports fast enumeration) AC_TRY_COMPILE([ @protocol OFFastEnumeration - (int)countByEnumeratingWithState: (void*)state objects: (id*)objects |
| ︙ | ︙ | |||
94 95 96 97 98 99 100 | ]) AC_MSG_CHECKING(whether Objective C compiler supports blocks) old_OBJCFLAGS="$OBJCFLAGS" OBJCFLAGS="$OBJCFLAGS -fblocks" AC_TRY_COMPILE([], [ int (^foo)(int bar); | | > | 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 |
])
AC_MSG_CHECKING(whether Objective C compiler supports blocks)
old_OBJCFLAGS="$OBJCFLAGS"
OBJCFLAGS="$OBJCFLAGS -fblocks"
AC_TRY_COMPILE([], [
int (^foo)(int bar);
foo = ^ (int bar) { return 0; }
], [
AC_DEFINE(OF_HAVE_BLOCKS, 1, [Compiler support for blocks])
AC_SUBST(BLOCKS_FLAGS, "-fblocks")
AC_SUBST(OFBLOCKTESTS_M, "OFBlockTests.m")
AC_MSG_RESULT(yes)
], [
AC_MSG_RESULT(no)
OBJCFLAGS="$old_OBJCFLAGS"
])
AC_CHECK_HEADERS([objfw-rt.h objc/objc.h])
test x"$ac_cv_header_objfw_rt_h" = x"yes" && objc_runtime="ObjFW-RT"
AC_MSG_CHECKING(which Objective C runtime we use)
AS_IF([test x"$ac_cv_header_objc_objc_h" = x"yes"], [
AC_EGREP_CPP(yes, [
#import <objc/objc.h>
#ifdef __GNU_LIBOBJC__
yes
#endif
], [
|
| ︙ | ︙ | |||
131 132 133 134 135 136 137 138 | ], [ test x"$objc_runtime" = x"" && objc_runtime="old GNU" ], [ objc_runtime="Apple" ]) ]) ]) | > < > > | > > > > > | > > > > > | > > > > > | > > > < | 133 134 135 136 137 138 139 140 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 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 191 192 193 194 195 196 | ], [ test x"$objc_runtime" = x"" && objc_runtime="old GNU" ], [ objc_runtime="Apple" ]) ]) ]) AC_MSG_RESULT($objc_runtime) case $objc_runtime in ObjFW-RT) AC_DEFINE(OF_OBJFW_RUNTIME, 1, [Whether we use the ObjFW runtime]) AC_SUBST(GNU_RUNTIME, "-fgnu-runtime") OBJCFLAGS="$OBJCFLAGS -fgnu-runtime" AC_CHECK_LIB(objfw-rt, objc_msg_lookup, [ LIBS="-lobjfw-rt $LIBS" ], [ AC_MSG_ERROR([libobjfw-rt not found!]) ]) ;; Apple) AC_DEFINE(OF_APPLE_RUNTIME, 1, [Whether we use the Apple ObjC runtime]) AC_CHECK_LIB(objc, objc_msgSend, [ LIBS="-lobjc $LIBS" ], [ AC_MSG_ERROR([libobjc not found!]) ]) ;; GNU) AC_DEFINE(OF_GNU_RUNTIME, 1, [Whether we use the GNU ObjC runtime]) AC_CHECK_LIB(objc, objc_msg_lookup, [ LIBS="-lobjc $LIBS" ], [ AC_MSG_ERROR([libobjc not found!]) ]) ;; "old GNU") AC_DEFINE(OF_OLD_GNU_RUNTIME, 1, [Whether we use the old GNU ObjC runtime]) AC_CHECK_LIB(objc, objc_msg_lookup, [ LIBS="-lobjc $LIBS" ], [ AC_MSG_ERROR([libobjc not found!]) ]) ;; *) AC_MSG_RESULT(none) AC_MSG_ERROR(No ObjC runtime found! Please install ObjFW-RT!) ;; esac AC_CHECK_FUNC(objc_getProperty,, [ AC_DEFINE(NEED_OBJC_PROPERTIES_INIT, 1, [Whether objc_properties_init needs to be called]) AC_SUBST(OBJC_PROPERTIES_M, "objc_properties.m") ]) |
| ︙ | ︙ | |||
448 449 450 451 452 453 454 | *) have_threadsafe_getaddrinfo="unknown" ;; esac AS_IF([test x"$have_threadsafe_getaddrinfo" = x"unknown"], [ AC_EGREP_CPP(yes, [ | > > > | > > > > > > | 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 | *) have_threadsafe_getaddrinfo="unknown" ;; esac AS_IF([test x"$have_threadsafe_getaddrinfo" = x"unknown"], [ AC_EGREP_CPP(yes, [ #ifndef _WIN32 # include <sys/types.h> # include <sys/socket.h> # include <netdb.h> #else # define _WIN32_WINNT 0x0501 # include <windows.h> # include <ws2tcpip.h> #endif #ifdef h_errno yes #end ], [ have_threadsafe_getaddrinfo="yes" ], [ have_threadsafe_getaddrinfo="no" |
| ︙ | ︙ | |||
481 482 483 484 485 486 487 | AS_IF([test x"$objc_runtime" = x"Apple"], [ AC_CHECK_HEADER(Foundation/NSObject.h, [ AC_SUBST(FOUNDATION_COMPAT_M, "foundation-compat.m") ]) ]) AS_IF([test x"$GOBJC" = x"yes"], [ | | < | | | | | > > > > > > > > > > > > > > > > > > > > > > > > > | 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 |
AS_IF([test x"$objc_runtime" = x"Apple"], [
AC_CHECK_HEADER(Foundation/NSObject.h, [
AC_SUBST(FOUNDATION_COMPAT_M, "foundation-compat.m")
])
])
AS_IF([test x"$GOBJC" = x"yes"], [
OBJCFLAGS="$OBJCFLAGS -Wwrite-strings -Wpointer-arith -Werror"
AC_MSG_CHECKING(whether gcc has bug objc/27438)
AC_TRY_COMPILE([
@interface OFConstantString
{
struct objc_class *isa;
const char *string;
unsigned long size;
}
@end
void *_OFConstantStringClassReference;
], [
OFConstantString *test = @"";
(void)test; /* Get rid of unused variable warning */
], [
AC_MSG_RESULT(no)
], [
AC_MSG_RESULT([yes, adding -Wno-unused-variable])
OBJCFLAGS="$OBJCFLAGS -Wno-unused-variable"
AC_SUBST(NO_WARN_UNUSED, "-Wno-unused-variable")
])
AC_MSG_CHECKING(whether we need -Wno-strict-aliasing due to gcc bugs)
AC_TRY_COMPILE([
@interface Foo
{
struct objc_class *isa;
}
@end
static struct {
struct objc_class *isa;
} object;
], [
Foo *test = (Foo*)&object;
(void)test; /* Get rid of unused variable warning */
], [
AC_MSG_RESULT(no)
], [
AC_MSG_RESULT(yes)
OBJCFLAGS="$OBJCFLAGS -Wno-strict-aliasing"
])
old_OBJCFLAGS="$OBJCFLAGS"
OBJCFLAGS="$OBJCFLAGS -Wcast-align"
AC_MSG_CHECKING(whether -Wcast-align is buggy)
AC_TRY_COMPILE([
@interface Foo
{
struct objc_class *isa;
}
@end
@implementation Foo
- (void)foo
{
struct objc_class *c = isa;
(void)c;
}
@end
], [
], [
AC_MSG_RESULT(no)
], [
AC_MSG_RESULT(yes)
OBJCFLAGS="$old_OBJCFLAGS"
])
])
AS_IF([test x"$cross_compiling" = x"yes"], [
AC_SUBST(BIN_PREFIX, "$host-")
case "$host" in
*-*-mingw*)
|
| ︙ | ︙ |
Modified extra.mk.in from [48b5fcc6f3] to [a6cef7bb66].
1 2 | OBJFW_SHARED_LIB = @OBJFW_SHARED_LIB@ OBJFW_STATIC_LIB = @OBJFW_STATIC_LIB@ | | | 1 2 3 4 5 6 7 8 9 10 |
OBJFW_SHARED_LIB = @OBJFW_SHARED_LIB@
OBJFW_STATIC_LIB = @OBJFW_STATIC_LIB@
OBJFW_LIB_MAJOR = 4
OBJFW_LIB_MINOR = 0
OBJFW_LIB_MAJOR_MINOR = ${OBJFW_LIB_MAJOR}.${OBJFW_LIB_MINOR}
ASPRINTF_M = @ASPRINTF_M@
ATOMIC_H = @ATOMIC_H@
BIN_PREFIX = @BIN_PREFIX@
EXCEPTIONS_A = @EXCEPTIONS_A@
|
| ︙ | ︙ |
Modified src/OFApplication.m from [c502011fa5] to [850529b70b].
| ︙ | ︙ | |||
15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 | */ #include "config.h" #define OF_APPLICATION_M #include <stdlib.h> #import "OFApplication.h" #import "OFString.h" #import "OFArray.h" #import "OFDictionary.h" #import "OFAutoreleasePool.h" #import "OFNotImplementedException.h" | > | | | | | 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 |
*/
#include "config.h"
#define OF_APPLICATION_M
#include <stdlib.h>
#include <string.h>
#import "OFApplication.h"
#import "OFString.h"
#import "OFArray.h"
#import "OFDictionary.h"
#import "OFAutoreleasePool.h"
#import "OFNotImplementedException.h"
#import "macros.h"
#if defined(__MACH__) && !defined(OF_IOS)
# include <crt_externs.h>
#elif !defined(OF_IOS)
extern char **environ;
#endif
static OFApplication *app = nil;
static void
atexit_handler()
{
|
| ︙ | ︙ | |||
99 100 101 102 103 104 105 |
- init
{
self = [super init];
@try {
OFAutoreleasePool *pool;
| > > > | > > > < < < < < > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 143 144 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 |
- init
{
self = [super init];
@try {
OFAutoreleasePool *pool;
#if defined(__MACH__) && !defined(OF_IOS)
char **env = *_NSGetEnviron();
#elif !defined(OF_IOS)
char **env = environ;
#else
char *env;
#endif
environment = [[OFMutableDictionary alloc] init];
atexit(atexit_handler);
pool = [[OFAutoreleasePool alloc] init];
#ifndef OF_IOS
for (; *env != NULL; env++) {
OFString *key;
OFString *value;
char *sep;
if ((sep = strchr(*env, '=')) == NULL) {
fprintf(stderr, "Warning: Invalid environment "
"variable: %s\n", *env);
continue;
}
key = [OFString stringWithCString: *env
length: sep - *env];
value = [OFString stringWithCString: sep + 1];
[environment setObject: value
forKey: key];
[pool releaseObjects];
}
#else
/*
* iOS does not provide environ and Apple does not allow using
* _NSGetEnviron on iOS. Therefore, we just get a few common
* variables from the environment which applications might
* expect.
*/
if ((env = getenv("HOME")) != NULL)
[environment
setObject: [OFString stringWithCString: env]
forKey: @"HOME"];
if ((env = getenv("PATH")) != NULL)
[environment
setObject: [OFString stringWithCString: env]
forKey: @"PATH"];
if ((env = getenv("SHELL")) != NULL)
[environment
setObject: [OFString stringWithCString: env]
forKey: @"SHELL"];
if ((env = getenv("TMPDIR")) != NULL)
[environment
setObject: [OFString stringWithCString: env]
forKey: @"TMPDIR"];
if ((env = getenv("USER")) != NULL)
[environment
setObject: [OFString stringWithCString: env]
forKey: @"USER"];
#endif
[pool release];
/*
* Class swizzle the environment to be immutable, as we don't
* need to change it anymore and expose it only as
* OFDictionary*. But not swizzling it would create a real copy
* each time -[copy] is called.
|
| ︙ | ︙ |
Modified src/OFArray.m from [57851d31d6] to [47df73404c].
| ︙ | ︙ | |||
111 112 113 114 115 116 117 118 119 120 121 122 123 124 |
{
self = [self init];
@try {
id obj;
[array addItem: &first];
while ((obj = va_arg(args, id)) != nil) {
[array addItem: &obj];
[obj retain];
}
} @catch (id e) {
[self release];
@throw e;
| > > | 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 |
{
self = [self init];
@try {
id obj;
[array addItem: &first];
[first retain];
while ((obj = va_arg(args, id)) != nil) {
[array addItem: &obj];
[obj retain];
}
} @catch (id e) {
[self release];
@throw e;
|
| ︙ | ︙ | |||
392 393 394 395 396 397 398 |
OF_HASH_FINALIZE(hash);
return hash;
}
- (OFString*)description
{
| | > > > > | 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 |
OF_HASH_FINALIZE(hash);
return hash;
}
- (OFString*)description
{
OFAutoreleasePool *pool;
OFMutableString *ret;
if ([array count] == 0)
return @"()";
pool = [[OFAutoreleasePool alloc] init];
ret = [[self componentsJoinedByString: @",\n"] mutableCopy];
@try {
[ret prependString: @"(\n"];
[ret replaceOccurrencesOfString: @"\n"
withString: @"\n\t"];
[ret appendString: @"\n)"];
|
| ︙ | ︙ | |||
561 562 563 564 565 566 567 | [super dealloc]; } @end @implementation OFArrayEnumerator - initWithArray: (OFArray*)array_ dataArray: (OFDataArray*)dataArray_ | | | 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 |
[super dealloc];
}
@end
@implementation OFArrayEnumerator
- initWithArray: (OFArray*)array_
dataArray: (OFDataArray*)dataArray_
mutationsPointer: (unsigned long*)mutationsPtr_
{
self = [super init];
array = [array_ retain];
dataArray = [dataArray_ retain];
count = [dataArray count];
mutations = (mutationsPtr_ != NULL ? *mutationsPtr_ : 0);
|
| ︙ | ︙ |
Modified src/OFBlock.m from [cb7452fd95] to [7216dff99f].
| ︙ | ︙ | |||
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 |
if ((--block->flags & OF_BLOCK_REFCOUNT_MASK) == 0) {
assert(of_spinlock_unlock(&spinlocks[hash]));
if (block->flags & OF_BLOCK_HAS_COPY_DISPOSE)
block->descriptor->dispose_helper(block);
free(block);
}
assert(of_spinlock_unlock(&spinlocks[hash]));
#endif
}
void
_Block_object_assign(void *dst_, const void *src_, const int flags_)
{
int flags = flags_ & (OF_BLOCK_FIELD_IS_BLOCK |
OF_BLOCK_FIELD_IS_OBJECT | OF_BLOCK_FIELD_IS_BYREF);
switch (flags) {
case OF_BLOCK_FIELD_IS_BLOCK:
*(of_block_literal_t**)dst_ = _Block_copy(src_);
break;
case OF_BLOCK_FIELD_IS_OBJECT:
*(id*)dst_ = [(id)src_ retain];
break;
case OF_BLOCK_FIELD_IS_BYREF:;
of_block_byref_t *src = (of_block_byref_t*)src_;
of_block_byref_t **dst = (of_block_byref_t**)dst_;
| > > > > > > > > | | > > > > > > | | 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 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 |
if ((--block->flags & OF_BLOCK_REFCOUNT_MASK) == 0) {
assert(of_spinlock_unlock(&spinlocks[hash]));
if (block->flags & OF_BLOCK_HAS_COPY_DISPOSE)
block->descriptor->dispose_helper(block);
free(block);
return;
}
assert(of_spinlock_unlock(&spinlocks[hash]));
#endif
}
void
_Block_object_assign(void *dst_, const void *src_, const int flags_)
{
int flags = flags_ & (OF_BLOCK_FIELD_IS_BLOCK |
OF_BLOCK_FIELD_IS_OBJECT | OF_BLOCK_FIELD_IS_BYREF);
if (src_ == NULL)
return;
if (flags_ & OF_BLOCK_BYREF_CALLER)
return;
switch (flags) {
case OF_BLOCK_FIELD_IS_BLOCK:
*(of_block_literal_t**)dst_ = _Block_copy(src_);
break;
case OF_BLOCK_FIELD_IS_OBJECT:
*(id*)dst_ = [(id)src_ retain];
break;
case OF_BLOCK_FIELD_IS_BYREF:;
of_block_byref_t *src = (of_block_byref_t*)src_;
of_block_byref_t **dst = (of_block_byref_t**)dst_;
if ((src->flags & OF_BLOCK_REFCOUNT_MASK) == 0) {
if ((*dst = malloc(src->size)) == NULL) {
alloc_failed_exception.isa =
[OFAllocFailedException class];
@throw (OFAllocFailedException*)
&alloc_failed_exception;
}
if (src->forwarding == src)
(*dst)->forwarding = *dst;
memcpy(*dst, src, src->size);
if (src->size >= sizeof(of_block_byref_t))
src->byref_keep(*dst, src);
} else
*dst = src;
(*dst)->flags++;
break;
}
}
void
_Block_object_dispose(const void *obj_, const int flags_)
{
const int flags = flags_ & (OF_BLOCK_FIELD_IS_BLOCK |
OF_BLOCK_FIELD_IS_OBJECT | OF_BLOCK_FIELD_IS_BYREF);
if (obj_ == NULL)
return;
if (flags_ & OF_BLOCK_BYREF_CALLER)
return;
switch (flags) {
case OF_BLOCK_FIELD_IS_BLOCK:
_Block_release(obj_);
break;
case OF_BLOCK_FIELD_IS_OBJECT:
[(id)obj_ release];
break;
case OF_BLOCK_FIELD_IS_BYREF:;
of_block_byref_t *obj = (of_block_byref_t*)obj_;
if ((--obj->flags & OF_BLOCK_REFCOUNT_MASK) == 0) {
if (obj->size >= sizeof(of_block_byref_t))
obj->byref_dispose(obj);
free(obj);
}
break;
}
|
| ︙ | ︙ | |||
420 421 422 423 424 425 426 |
OF_BLOCK_REFCOUNT_MASK;
return OF_RETAIN_COUNT_MAX;
}
- (void)release
{
| > | | 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 |
OF_BLOCK_REFCOUNT_MASK;
return OF_RETAIN_COUNT_MAX;
}
- (void)release
{
if (isa == (Class)&_NSConcreteMallocBlock)
Block_release(self);
}
- (void)dealloc
{
@throw [OFNotImplementedException newWithClass: isa
selector: _cmd];
[super dealloc]; /* Get rid of a stupid warning */
|
| ︙ | ︙ |
Modified src/OFConstantString.m from [40257b41d9] to [e051d86f17].
| ︙ | ︙ | |||
50 51 52 53 54 55 56 |
- initWithCString: (const char*)str
{
@throw [OFNotImplementedException newWithClass: isa
selector: _cmd];
}
- initWithCString: (const char*)str
| | | 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 |
- initWithCString: (const char*)str
{
@throw [OFNotImplementedException newWithClass: isa
selector: _cmd];
}
- initWithCString: (const char*)str
encoding: (of_string_encoding_t)encoding
{
@throw [OFNotImplementedException newWithClass: isa
selector: _cmd];
}
- initWithCString: (const char*)str
encoding: (of_string_encoding_t)encoding
|
| ︙ | ︙ |
Modified src/OFDate.m from [d33bbd220e] to [00ea6c929d].
| ︙ | ︙ | |||
28 29 30 31 32 33 34 35 36 37 38 39 40 41 |
#ifdef OF_THREADS
# import "OFThread.h"
#endif
#import "OFInitializationFailedException.h"
#import "OFInvalidArgumentException.h"
#import "OFOutOfRangeException.h"
#if (!defined(HAVE_GMTIME_R) || !defined(HAVE_LOCALTIME_R)) && \
defined(OF_THREADS)
static OFMutex *mutex;
#endif
#ifdef HAVE_GMTIME_R
| > > | 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 |
#ifdef OF_THREADS
# import "OFThread.h"
#endif
#import "OFInitializationFailedException.h"
#import "OFInvalidArgumentException.h"
#import "OFOutOfRangeException.h"
#import "macros.h"
#if (!defined(HAVE_GMTIME_R) || !defined(HAVE_LOCALTIME_R)) && \
defined(OF_THREADS)
static OFMutex *mutex;
#endif
#ifdef HAVE_GMTIME_R
|
| ︙ | ︙ | |||
243 244 245 246 247 248 249 250 251 252 253 254 255 256 |
if (![obj isKindOfClass: [OFDate class]])
return NO;
if (((OFDate*)obj)->sec != sec || ((OFDate*)obj)->usec != usec)
return NO;
return YES;
}
- copy
{
return [self retain];
}
- (of_comparison_result_t)compare: (id)obj
| > > > > > > > > > > > > > > > > > > > > > > > > > | 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 |
if (![obj isKindOfClass: [OFDate class]])
return NO;
if (((OFDate*)obj)->sec != sec || ((OFDate*)obj)->usec != usec)
return NO;
return YES;
}
- (uint32_t)hash
{
uint32_t hash;
OF_HASH_INIT(hash);
OF_HASH_ADD(hash, (sec >> 56) & 0xFF);
OF_HASH_ADD(hash, (sec >> 48) & 0xFF);
OF_HASH_ADD(hash, (sec >> 40) & 0xFF);
OF_HASH_ADD(hash, (sec >> 32) & 0xFF);
OF_HASH_ADD(hash, (sec >> 24) & 0xFF);
OF_HASH_ADD(hash, (sec >> 16) & 0xFF);
OF_HASH_ADD(hash, (sec >> 8) & 0xFF);
OF_HASH_ADD(hash, sec & 0xFF);
OF_HASH_ADD(hash, (usec >> 24) & 0xFF);
OF_HASH_ADD(hash, (usec >> 16) & 0xFF);
OF_HASH_ADD(hash, (usec >> 8) & 0xFF);
OF_HASH_ADD(hash, usec & 0xFF);
OF_HASH_FINALIZE(hash);
return hash;
}
- copy
{
return [self retain];
}
- (of_comparison_result_t)compare: (id)obj
|
| ︙ | ︙ |
Modified src/OFDictionary.m from [69df15df8e] to [af933f0dd2].
| ︙ | ︙ | |||
32 33 34 35 36 37 38 |
struct of_dictionary_bucket of_dictionary_deleted_bucket = {};
#define BUCKET struct of_dictionary_bucket
#define DELETED &of_dictionary_deleted_bucket
@implementation OFDictionary
| | | 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 |
struct of_dictionary_bucket of_dictionary_deleted_bucket = {};
#define BUCKET struct of_dictionary_bucket
#define DELETED &of_dictionary_deleted_bucket
@implementation OFDictionary
+ dictionary
{
return [[[self alloc] init] autorelease];
}
+ dictionaryWithDictionary: (OFDictionary*)dict
{
return [[[self alloc] initWithDictionary: dict] autorelease];
|
| ︙ | ︙ | |||
144 145 146 147 148 149 150 151 152 153 154 155 156 157 |
forKey: (id <OFCopying>)key
{
self = [super init];
@try {
uint32_t i;
BUCKET *b;
data = [self allocMemoryForNItems: 2
withSize: sizeof(BUCKET*)];
size = 2;
for (i = 0; i < size; i++)
data[i] = NULL;
| > > > > | 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 |
forKey: (id <OFCopying>)key
{
self = [super init];
@try {
uint32_t i;
BUCKET *b;
if (key == nil || obj == nil)
@throw [OFInvalidArgumentException newWithClass: isa
selector: _cmd];
data = [self allocMemoryForNItems: 2
withSize: sizeof(BUCKET*)];
size = 2;
for (i = 0; i < size; i++)
data[i] = NULL;
|
| ︙ | ︙ | |||
451 452 453 454 455 456 457 458 459 460 461 462 463 464 |
[data[j]->object release];
} @catch (id e) {
[obj release];
@throw e;
}
data[j]->object = obj;
}
} @catch (id e) {
[self release];
@throw e;
}
return self;
| > | 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 |
[data[j]->object release];
} @catch (id e) {
[obj release];
@throw e;
}
data[j]->object = obj;
count--;
}
} @catch (id e) {
[self release];
@throw e;
}
return self;
|
| ︙ | ︙ | |||
701 702 703 704 705 706 707 |
OF_HASH_FINALIZE(hash);
return hash;
}
- (OFString*)description
{
| | | | > | > > > > > > > > > | | | 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 |
OF_HASH_FINALIZE(hash);
return hash;
}
- (OFString*)description
{
OFMutableString *ret;
OFAutoreleasePool *pool, *pool2;
OFEnumerator *keyEnumerator;
OFEnumerator *objectEnumerator;
id key, object;
size_t i;
if (count == 0)
return @"{}";
ret = [OFMutableString stringWithString: @"{\n"];
pool = [[OFAutoreleasePool alloc] init];
keyEnumerator = [self keyEnumerator];
objectEnumerator = [self objectEnumerator];
i = 0;
pool2 = [[OFAutoreleasePool alloc] init];
while ((key = [keyEnumerator nextObject]) != nil &&
(object = [objectEnumerator nextObject]) != nil) {
[ret appendString: [key description]];
[ret appendString: @" = "];
[ret appendString: [object description]];
if (++i < count)
[ret appendString: @";\n"];
[pool2 releaseObjects];
}
[ret replaceOccurrencesOfString: @"\n"
|
| ︙ | ︙ |
Modified src/OFFile.m from [696b6c1432] to [6ef70328cc].
| ︙ | ︙ | |||
12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #include <stdio.h> #include <string.h> #include <stdarg.h> #include <unistd.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> #include <dirent.h> | > > > > | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #define __NO_EXT_QNX #include <stdio.h> #include <stdlib.h> #include <string.h> #include <stdarg.h> #include <unistd.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> #include <dirent.h> |
| ︙ | ︙ |
Modified src/OFHTTPRequest.m from [5637b3f014] to [739e92f9e0].
| ︙ | ︙ | |||
19 20 21 22 23 24 25 26 27 28 29 30 31 32 | #include <string.h> #import "OFHTTPRequest.h" #import "OFString.h" #import "OFURL.h" #import "OFTCPSocket.h" #import "OFDictionary.h" #import "OFAutoreleasePool.h" #import "OFHTTPRequestFailedException.h" #import "OFInvalidServerReplyException.h" #import "OFOutOfRangeException.h" #import "OFTruncatedDataException.h" #import "OFUnsupportedProtocolException.h" | > | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | #include <string.h> #import "OFHTTPRequest.h" #import "OFString.h" #import "OFURL.h" #import "OFTCPSocket.h" #import "OFDictionary.h" #import "OFDataArray.h" #import "OFAutoreleasePool.h" #import "OFHTTPRequestFailedException.h" #import "OFInvalidServerReplyException.h" #import "OFOutOfRangeException.h" #import "OFTruncatedDataException.h" #import "OFUnsupportedProtocolException.h" |
| ︙ | ︙ | |||
163 164 165 166 167 168 169 |
@try {
OFString *line, *path;
OFMutableDictionary *s_headers;
OFDataArray *data;
OFEnumerator *enumerator;
OFString *key;
int status;
| | | 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 |
@try {
OFString *line, *path;
OFMutableDictionary *s_headers;
OFDataArray *data;
OFEnumerator *enumerator;
OFString *key;
int status;
const char *t = NULL;
[sock connectToHost: [URL host]
onPort: [URL port]];
/*
* Work around a bug with packet bisection in lighttpd when
* using HTTPS.
|
| ︙ | ︙ |
Modified src/OFList.m from [ca60541ce0] to [169f8b1473].
| ︙ | ︙ | |||
48 49 50 51 52 53 54 | for (iter = firstListObject; iter != NULL; iter = iter->next) [iter->object release]; [super dealloc]; } | | | | 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 |
for (iter = firstListObject; iter != NULL; iter = iter->next)
[iter->object release];
[super dealloc];
}
- (of_list_object_t*)firstListObject
{
return firstListObject;
}
- (of_list_object_t*)lastListObject
{
return lastListObject;
}
- (of_list_object_t*)appendObject: (id)obj
{
of_list_object_t *o;
|
| ︙ | ︙ | |||
77 78 79 80 81 82 83 | lastListObject = o; if (firstListObject == NULL) firstListObject = o; count++; mutations++; | < < | 77 78 79 80 81 82 83 84 85 86 87 88 89 90 |
lastListObject = o;
if (firstListObject == NULL)
firstListObject = o;
count++;
mutations++;
return o;
}
- (of_list_object_t*)prependObject: (id)obj
{
of_list_object_t *o;
|
| ︙ | ︙ | |||
101 102 103 104 105 106 107 | firstListObject = o; if (lastListObject == NULL) lastListObject = o; count++; mutations++; | < < | 99 100 101 102 103 104 105 106 107 108 109 110 111 112 |
firstListObject = o;
if (lastListObject == NULL)
lastListObject = o;
count++;
mutations++;
return o;
}
- (of_list_object_t*)insertObject: (id)obj
beforeListObject: (of_list_object_t*)listobj
{
of_list_object_t *o;
|
| ︙ | ︙ | |||
127 128 129 130 131 132 133 | if (listobj == firstListObject) firstListObject = o; count++; mutations++; | < < | 123 124 125 126 127 128 129 130 131 132 133 134 135 136 |
if (listobj == firstListObject)
firstListObject = o;
count++;
mutations++;
return o;
}
- (of_list_object_t*)insertObject: (id)obj
afterListObject: (of_list_object_t*)listobj
{
of_list_object_t *o;
|
| ︙ | ︙ | |||
153 154 155 156 157 158 159 | if (listobj == lastListObject) lastListObject = o; count++; mutations++; | < < | 147 148 149 150 151 152 153 154 155 156 157 158 159 160 |
if (listobj == lastListObject)
lastListObject = o;
count++;
mutations++;
return o;
}
- (void)removeListObject: (of_list_object_t*)listobj
{
if (listobj->prev != NULL)
listobj->prev->next = listobj->next;
|
| ︙ | ︙ | |||
255 256 257 258 259 260 261 | if (new->firstListObject == NULL) new->firstListObject = o; if (prev != NULL) prev->next = o; new->count++; | < < | 247 248 249 250 251 252 253 254 255 256 257 258 259 260 |
if (new->firstListObject == NULL)
new->firstListObject = o;
if (prev != NULL)
prev->next = o;
new->count++;
prev = o;
}
} @catch (id e) {
[new release];
@throw e;
}
|
| ︙ | ︙ | |||
292 293 294 295 296 297 298 |
OF_HASH_FINALIZE(hash);
return hash;
}
- (OFString*)description
{
| | > > > > | 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 |
OF_HASH_FINALIZE(hash);
return hash;
}
- (OFString*)description
{
OFMutableString *ret;
OFAutoreleasePool *pool;
of_list_object_t *iter;
if (count == 0)
return @"[]";
ret = [OFMutableString stringWithString: @"[\n"];
pool = [[OFAutoreleasePool alloc] init];
for (iter = firstListObject; iter != NULL; iter = iter->next) {
[ret appendString: [iter->object description]];
if (iter->next != NULL)
[ret appendString: @",\n"];
|
| ︙ | ︙ | |||
354 355 356 357 358 359 360 | initWithList: self mutationsPointer: &mutations] autorelease]; } @end @implementation OFListEnumerator - initWithList: (OFList*)list_ | | | 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 |
initWithList: self
mutationsPointer: &mutations] autorelease];
}
@end
@implementation OFListEnumerator
- initWithList: (OFList*)list_
mutationsPointer: (unsigned long*)mutationsPtr_
{
self = [super init];
list = [list_ retain];
current = [list firstListObject];
mutations = *mutationsPtr_;
mutationsPtr = mutationsPtr_;
|
| ︙ | ︙ |
Modified src/OFMutableString.m from [fe52a06baf] to [6944810146].
| ︙ | ︙ | |||
61 62 63 64 65 66 67 | if ((t = table[0][*p]) != 0) *p = t; return; } ulen = [self length]; | | | < | | 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 |
if ((t = table[0][*p]) != 0)
*p = t;
return;
}
ulen = [self length];
ustr = [self allocMemoryForNItems: ulen
withSize: sizeof(of_unichar_t)];
i = j = 0;
nlen = 0;
while (i < length) {
clen = of_string_utf8_to_unicode(string + i, length - i, &c);
if (clen == 0 || c > 0x10FFFF) {
[self freeMemory: ustr];
|
| ︙ | ︙ | |||
134 135 136 137 138 139 140 141 142 143 144 145 146 147 |
- (void)setToCString: (const char*)str
{
size_t len;
[self freeMemory: string];
len = strlen(str);
switch (of_string_check_utf8(str, len)) {
case 0:
isUTF8 = NO;
break;
case 1:
isUTF8 = YES;
| > > > > > | 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 |
- (void)setToCString: (const char*)str
{
size_t len;
[self freeMemory: string];
len = strlen(str);
if (len >= 3 && !memcmp(str, "\xEF\xBB\xBF", 3)) {
str += 3;
len -= 3;
}
switch (of_string_check_utf8(str, len)) {
case 0:
isUTF8 = NO;
break;
case 1:
isUTF8 = YES;
|
| ︙ | ︙ | |||
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 187 188 189 190 191 |
}
- (void)appendCString: (const char*)str
{
size_t strlength;
strlength = strlen(str);
switch (of_string_check_utf8(str, strlength)) {
case 1:
isUTF8 = YES;
break;
case -1:
@throw [OFInvalidEncodingException newWithClass: isa];
}
string = [self resizeMemory: string
toSize: length + strlength + 1];
memcpy(string + length, str, strlength + 1);
length += strlength;
}
- (void)appendCString: (const char*)str
withLength: (size_t)len
{
switch (of_string_check_utf8(str, len)) {
case 1:
isUTF8 = YES;
break;
case -1:
@throw [OFInvalidEncodingException newWithClass: isa];
}
| > > > > > > > > > > | 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 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 |
}
- (void)appendCString: (const char*)str
{
size_t strlength;
strlength = strlen(str);
if (strlength >= 3 && !memcmp(str, "\xEF\xBB\xBF", 3)) {
str += 3;
strlength -= 3;
}
switch (of_string_check_utf8(str, strlength)) {
case 1:
isUTF8 = YES;
break;
case -1:
@throw [OFInvalidEncodingException newWithClass: isa];
}
string = [self resizeMemory: string
toSize: length + strlength + 1];
memcpy(string + length, str, strlength + 1);
length += strlength;
}
- (void)appendCString: (const char*)str
withLength: (size_t)len
{
if (len >= 3 && !memcmp(str, "\xEF\xBB\xBF", 3)) {
str += 3;
len -= 3;
}
switch (of_string_check_utf8(str, len)) {
case 1:
isUTF8 = YES;
break;
case -1:
@throw [OFInvalidEncodingException newWithClass: isa];
}
|
| ︙ | ︙ | |||
264 265 266 267 268 269 270 |
atIndex: 0];
}
- (void)reverse
{
size_t i, j, len = length / 2;
| | | | | | | | | | 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 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 |
atIndex: 0];
}
- (void)reverse
{
size_t i, j, len = length / 2;
madvise(string, length, MADV_SEQUENTIAL);
/* We reverse all bytes and restore UTF-8 later, if necessary */
for (i = 0, j = length - 1; i < len; i++, j--) {
string[i] ^= string[j];
string[j] ^= string[i];
string[i] ^= string[j];
}
if (!isUTF8) {
madvise(string, length, MADV_NORMAL);
return;
}
for (i = 0; i < length; i++) {
/* ASCII */
if (OF_LIKELY(!(string[i] & 0x80)))
continue;
/* A start byte can't happen first as we reversed everything */
if (OF_UNLIKELY(string[i] & 0x40)) {
madvise(string, length, MADV_NORMAL);
@throw [OFInvalidEncodingException newWithClass: isa];
}
/* Next byte must not be ASCII */
if (OF_UNLIKELY(length < i + 1 || !(string[i + 1] & 0x80))) {
madvise(string, length, MADV_NORMAL);
@throw [OFInvalidEncodingException newWithClass: isa];
}
/* Next byte is the start byte */
if (OF_LIKELY(string[i + 1] & 0x40)) {
string[i] ^= string[i + 1];
string[i + 1] ^= string[i];
string[i] ^= string[i + 1];
i++;
continue;
}
/* Second next byte must not be ASCII */
if (OF_UNLIKELY(length < i + 2 || !(string[i + 2] & 0x80))) {
madvise(string, length, MADV_NORMAL);
@throw [OFInvalidEncodingException newWithClass: isa];
}
/* Second next byte is the start byte */
if (OF_LIKELY(string[i + 2] & 0x40)) {
string[i] ^= string[i + 2];
string[i + 2] ^= string[i];
string[i] ^= string[i + 2];
i += 2;
continue;
}
/* Third next byte must not be ASCII */
if (OF_UNLIKELY(length < i + 3 || !(string[i + 3] & 0x80))) {
madvise(string, length, MADV_NORMAL);
@throw [OFInvalidEncodingException newWithClass: isa];
}
/* Third next byte is the start byte */
if (OF_LIKELY(string[i + 3] & 0x40)) {
string[i] ^= string[i + 3];
string[i + 3] ^= string[i];
string[i] ^= string[i + 3];
string[i + 1] ^= string[i + 2];
string[i + 2] ^= string[i + 1];
string[i + 1] ^= string[i + 2];
i += 3;
continue;
}
/* UTF-8 does not allow more than 4 bytes per character */
madvise(string, length, MADV_NORMAL);
@throw [OFInvalidEncodingException newWithClass: isa];
}
madvise(string, length, MADV_NORMAL);
}
- (void)upper
{
[self _applyTable: of_unicode_upper_table
withSize: OF_UNICODE_UPPER_TABLE_SIZE];
}
|
| ︙ | ︙ |
Modified src/OFNumber.h from [fd0954f29b] to [0944a92f2e].
| ︙ | ︙ | |||
10 11 12 13 14 15 16 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ | | | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 |
*
* Alternatively, it may be distributed under the terms of the GNU General
* Public License, either version 2 or 3, which can be found in the file
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
#include <sys/types.h>
#import "OFObject.h"
/**
* \brief The type of a number.
*/
typedef enum of_number_type_t {
|
| ︙ | ︙ |
Modified src/OFObject.m from [66f93123ef] to [2e1d6a6c76].
| ︙ | ︙ | |||
12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h> #include <assert.h> #import "OFObject.h" #import "OFAutoreleasePool.h" #import "OFAllocFailedException.h" #import "OFEnumerationMutationException.h" | > > > > | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #define __NO_EXT_QNX #include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h> #include <assert.h> #import "OFObject.h" #import "OFAutoreleasePool.h" #import "OFAllocFailedException.h" #import "OFEnumerationMutationException.h" |
| ︙ | ︙ | |||
37 38 39 40 41 42 43 44 45 46 47 48 49 50 | #import "macros.h" #if defined(OF_OBJFW_RUNTIME) # import <objfw-rt.h> #elif defined(OF_OLD_GNU_RUNTIME) # import <objc/objc-api.h> # import <objc/sarray.h> #else # import <objc/runtime.h> #endif #ifdef _WIN32 # include <windows.h> #endif | > | 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 | #import "macros.h" #if defined(OF_OBJFW_RUNTIME) # import <objfw-rt.h> #elif defined(OF_OLD_GNU_RUNTIME) # import <objc/objc-api.h> # import <objc/sarray.h> # import <objc/Protocol.h> #else # import <objc/runtime.h> #endif #ifdef _WIN32 # include <windows.h> #endif |
| ︙ | ︙ | |||
247 248 249 250 251 252 253 | Class c; struct objc_protocol_list *pl; size_t i; for (c = self; c != Nil; c = class_get_super_class(c)) for (pl = c->protocols; pl != NULL; pl = pl->next) for (i = 0; i < pl->count; i++) | | | 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 | Class c; struct objc_protocol_list *pl; size_t i; for (c = self; c != Nil; c = class_get_super_class(c)) for (pl = c->protocols; pl != NULL; pl = pl->next) for (i = 0; i < pl->count; i++) if ([pl->list[i] conformsTo: protocol]) return YES; return NO; #else Class c; for (c = self; c != Nil; c = class_getSuperclass(c)) |
| ︙ | ︙ | |||
360 361 362 363 364 365 366 | */ return class_replaceMethod(((OFObject*)self)->isa, selector, newimp, method_getTypeEncoding(method)); #endif } + (IMP)replaceClassMethod: (SEL)selector | | | 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 |
*/
return class_replaceMethod(((OFObject*)self)->isa, selector, newimp,
method_getTypeEncoding(method));
#endif
}
+ (IMP)replaceClassMethod: (SEL)selector
withMethodFromClass: (Class)class
{
IMP newimp;
if (![class isSubclassOfClass: self])
@throw [OFInvalidArgumentException newWithClass: self
selector: _cmd];
|
| ︙ | ︙ | |||
418 419 420 421 422 423 424 | return class_replaceMethod(self, selector, newimp, method_getTypeEncoding(method)); #endif } + (IMP)replaceInstanceMethod: (SEL)selector | | | 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 |
return class_replaceMethod(self, selector, newimp,
method_getTypeEncoding(method));
#endif
}
+ (IMP)replaceInstanceMethod: (SEL)selector
withMethodFromClass: (Class)class
{
IMP newimp;
if (![class isSubclassOfClass: self])
@throw [OFInvalidArgumentException newWithClass: self
selector: _cmd];
|
| ︙ | ︙ | |||
676 677 678 679 680 681 682 | if (nitems > SIZE_MAX / size) @throw [OFOutOfRangeException newWithClass: isa]; return [self resizeMemory: ptr toSize: nitems * size]; } | | | 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 |
if (nitems > SIZE_MAX / size)
@throw [OFOutOfRangeException newWithClass: isa];
return [self resizeMemory: ptr
toSize: nitems * size];
}
- (void)freeMemory: (void*)ptr
{
void **iter, *last, **memchunks;
size_t i, memchunks_size;
if (ptr == NULL)
return;
|
| ︙ | ︙ |
Modified src/OFSeekableStream.h from [9a400a86be] to [09e4c069c6].
| ︙ | ︙ | |||
10 11 12 13 14 15 16 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ | < < < | | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include <sys/types.h> #import "OFStream.h" /** * \brief A stream that supports seeking. * * IMPORTANT: If you want to subclass this, override _seekToOffset:, |
| ︙ | ︙ |
Modified src/OFStream.m from [585894669b] to [3a59210341].
| ︙ | ︙ | |||
12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <assert.h> #include <fcntl.h> #ifndef _WIN32 # include <signal.h> #endif #import "OFStream.h" | > > > | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #define __NO_EXT_QNX #include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <assert.h> #include <fcntl.h> #ifndef _WIN32 # include <signal.h> #endif #import "OFStream.h" |
| ︙ | ︙ |
Modified src/OFStreamObserver.m from [90468a0a65] to [fbacb17597].
| ︙ | ︙ | |||
13 14 15 16 17 18 19 20 21 22 23 24 25 26 | * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #define OF_STREAM_OBSERVER_M #include <string.h> #include <assert.h> #include <unistd.h> | > | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 | * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #define OF_STREAM_OBSERVER_M #define __NO_EXT_QNX #include <string.h> #include <assert.h> #include <unistd.h> |
| ︙ | ︙ | |||
37 38 39 40 41 42 43 44 45 46 47 48 49 50 |
#ifdef _WIN32
# import "OFTCPSocket.h"
#endif
#import "OFAutoreleasePool.h"
#import "OFInitializationFailedException.h"
#import "OFOutOfRangeException.h"
#ifdef _WIN32
# define close(sock) closesocket(sock)
#endif
enum {
QUEUE_ADD = 0,
| > > | 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 |
#ifdef _WIN32
# import "OFTCPSocket.h"
#endif
#import "OFAutoreleasePool.h"
#import "OFInitializationFailedException.h"
#import "OFOutOfRangeException.h"
#import "macros.h"
#ifdef _WIN32
# define close(sock) closesocket(sock)
#endif
enum {
QUEUE_ADD = 0,
|
| ︙ | ︙ | |||
151 152 153 154 155 156 157 |
#endif
[super dealloc];
}
- (id <OFStreamObserverDelegate>)delegate
{
| | < < | | 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 |
#endif
[super dealloc];
}
- (id <OFStreamObserverDelegate>)delegate
{
OF_GETTER(delegate, YES)
}
- (void)setDelegate: (id <OFStreamObserverDelegate>)delegate_
{
OF_SETTER(delegate, delegate_, YES, NO)
}
#ifdef OF_HAVE_POLL
- (void)_addStream: (OFStream*)stream
withEvents: (short)events
{
struct pollfd *fds_c = [fds cArray];
|
| ︙ | ︙ | |||
485 486 487 488 489 490 491 492 493 494 495 496 497 498 |
FD_COPY(&exceptfds, &exceptfds_);
# else
readfds_ = readfds;
writefds_ = writefds;
exceptfds_ = exceptfds;
# endif
if (select(nfds, &readfds_, &writefds_, &exceptfds_,
(timeout != -1 ? &tv : NULL)) < 1)
return NO;
if (FD_ISSET(cancelFd[0], &readfds_)) {
char buf;
#ifndef _WIN32
| > > > | 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 |
FD_COPY(&exceptfds, &exceptfds_);
# else
readfds_ = readfds;
writefds_ = writefds;
exceptfds_ = exceptfds;
# endif
tv.tv_sec = timeout / 1000;
tv.tv_usec = (timeout % 1000) * 1000;
if (select(nfds, &readfds_, &writefds_, &exceptfds_,
(timeout != -1 ? &tv : NULL)) < 1)
return NO;
if (FD_ISSET(cancelFd[0], &readfds_)) {
char buf;
#ifndef _WIN32
|
| ︙ | ︙ |
Modified src/OFStreamSocket.m from [f8648491b3] to [49fed451d1].
| ︙ | ︙ | |||
12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #include <string.h> #include <unistd.h> #include <errno.h> #ifndef _WIN32 # include <sys/types.h> # include <sys/socket.h> #endif | > > > > | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #define __NO_EXT_QNX #include <string.h> #include <unistd.h> #include <errno.h> #ifndef _WIN32 # include <sys/types.h> # include <sys/socket.h> #endif |
| ︙ | ︙ |
Modified src/OFString+XMLEscaping.m from [c2066f8693] to [aa261c5ddc].
| ︙ | ︙ | |||
63 64 65 66 67 68 69 70 71 72 73 74 75 76 |
append = "'";
append_len = 6;
break;
case '&':
append = "&";
append_len = 5;
break;
default:
append = NULL;
append_len = 0;
}
if (append != NULL) {
if ((tmp = realloc(str_c, len + append_len)) == NULL) {
| > > > > | 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 |
append = "'";
append_len = 6;
break;
case '&':
append = "&";
append_len = 5;
break;
case '\r':
append = "
";
append_len = 5;
break;
default:
append = NULL;
append_len = 0;
}
if (append != NULL) {
if ((tmp = realloc(str_c, len + append_len)) == NULL) {
|
| ︙ | ︙ |
Modified src/OFString.h from [3da081c65e] to [373d429e50].
| ︙ | ︙ | |||
413 414 415 416 417 418 419 | */ - (BOOL)hasSuffix: (OFString*)suffix; /** * Splits an OFString into an OFArray of OFStrings. * * \param delimiter The delimiter for splitting | | | 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 | */ - (BOOL)hasSuffix: (OFString*)suffix; /** * Splits an OFString into an OFArray of OFStrings. * * \param delimiter The delimiter for splitting * \return An autoreleased OFArray with the split string */ - (OFArray*)componentsSeparatedByString: (OFString*)delimiter; /** * \return The components of the path */ - (OFArray*)pathComponents; |
| ︙ | ︙ |
Modified src/OFString.m from [a034b6e9c4] to [44fb801c23].
| ︙ | ︙ | |||
31 32 33 34 35 36 37 38 39 40 41 42 43 44 | #endif #import "OFString.h" #import "OFArray.h" #import "OFFile.h" #import "OFURL.h" #import "OFHTTPRequest.h" #import "OFAutoreleasePool.h" #import "OFHTTPRequestFailedException.h" #import "OFInitializationFailedException.h" #import "OFInvalidArgumentException.h" #import "OFInvalidEncodingException.h" #import "OFInvalidFormatException.h" | > | 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 | #endif #import "OFString.h" #import "OFArray.h" #import "OFFile.h" #import "OFURL.h" #import "OFHTTPRequest.h" #import "OFDataArray.h" #import "OFAutoreleasePool.h" #import "OFHTTPRequestFailedException.h" #import "OFInitializationFailedException.h" #import "OFInvalidArgumentException.h" #import "OFInvalidEncodingException.h" #import "OFInvalidFormatException.h" |
| ︙ | ︙ | |||
95 96 97 98 99 100 101 |
/* We're missing a start byte here */
if (OF_UNLIKELY(!(str[i] & 0x40))) {
madvise((void*)str, len, MADV_NORMAL);
return -1;
}
/* We have at minimum a 2 byte character -> check next byte */
| | | | | 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 |
/* We're missing a start byte here */
if (OF_UNLIKELY(!(str[i] & 0x40))) {
madvise((void*)str, len, MADV_NORMAL);
return -1;
}
/* We have at minimum a 2 byte character -> check next byte */
if (OF_UNLIKELY(len <= i + 1 || (str[i + 1] & 0xC0) != 0x80)) {
madvise((void*)str, len, MADV_NORMAL);
return -1;
}
/* Check if we have at minimum a 3 byte character */
if (OF_LIKELY(!(str[i] & 0x20))) {
i++;
continue;
}
/* We have at minimum a 3 byte char -> check second next byte */
if (OF_UNLIKELY(len <= i + 2 || (str[i + 2] & 0xC0) != 0x80)) {
madvise((void*)str, len, MADV_NORMAL);
return -1;
}
/* Check if we have a 4 byte character */
if (OF_LIKELY(!(str[i] & 0x10))) {
i += 2;
continue;
}
/* We have a 4 byte character -> check third next byte */
if (OF_UNLIKELY(len <= i + 3 || (str[i + 3] & 0xC0) != 0x80)) {
madvise((void*)str, len, MADV_NORMAL);
return -1;
}
/*
* Just in case, check if there's a 5th character, which is
* forbidden by UTF-8
|
| ︙ | ︙ | |||
662 663 664 665 666 667 668 669 670 671 672 |
OFFile *file;
if (stat([path cString], &s) == -1)
@throw [OFOpenFileFailedException newWithClass: isa
path: path
mode: @"rb"];
file = [[OFFile alloc] initWithPath: path
mode: @"rb"];
@try {
| > > > | | | | 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 |
OFFile *file;
if (stat([path cString], &s) == -1)
@throw [OFOpenFileFailedException newWithClass: isa
path: path
mode: @"rb"];
if (s.st_size > SIZE_MAX)
@throw [OFOutOfRangeException newWithClass: isa];
file = [[OFFile alloc] initWithPath: path
mode: @"rb"];
@try {
tmp = [self allocMemoryWithSize: (size_t)s.st_size];
[file readExactlyNBytes: (size_t)s.st_size
intoBuffer: tmp];
} @finally {
[file release];
}
} @catch (id e) {
[self release];
@throw e;
}
self = [self initWithCString: tmp
encoding: encoding
length: (size_t)s.st_size];
[self freeMemory: tmp];
return self;
}
- initWithContentsOfURL: (OFURL*)url
{
|
| ︙ | ︙ | |||
1206 1207 1208 1209 1210 1211 1212 | if (i < 0) i = 0; return [OFString stringWithCString: string + i length: path_len - i]; } | | | 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 |
if (i < 0)
i = 0;
return [OFString stringWithCString: string + i
length: path_len - i];
}
- (OFString*)stringByDeletingLastPathComponent
{
size_t i, path_len = length;
if (path_len == 0)
return @"";
#ifndef _WIN32
|
| ︙ | ︙ | |||
1413 1414 1415 1416 1417 1418 1419 |
i = j = 0;
while (i < length) {
of_unichar_t c;
size_t clen;
| | | 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 |
i = j = 0;
while (i < length) {
of_unichar_t c;
size_t clen;
clen = of_string_utf8_to_unicode(string + i, length - i, &c);
if (clen == 0 || c > 0x10FFFF) {
free(ret);
@throw [OFInvalidEncodingException newWithClass: isa];
}
ret[j++] = c;
|
| ︙ | ︙ |
Modified src/OFTCPSocket.h from [98f00d6f79] to [7f7c70792a].
| ︙ | ︙ | |||
32 33 34 35 36 37 38 |
* \brief A class which provides functions to create and use TCP sockets.
*
* To connect to a server, create a socket and connect it.
* To create a server, create a socket, bind it and listen on it.
*/
@interface OFTCPSocket: OFStreamSocket
{
| | | | | 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 |
* \brief A class which provides functions to create and use TCP sockets.
*
* To connect to a server, create a socket and connect it.
* To create a server, create a socket, bind it and listen on it.
*/
@interface OFTCPSocket: OFStreamSocket
{
BOOL isListening;
struct sockaddr_storage *sockAddr;
socklen_t sockAddrLen;
}
/**
* Connect the OFTCPSocket to the specified destination.
*
* \param host The host to connect to
* \param port The port on the host to connect to
|
| ︙ | ︙ |
Modified src/OFTCPSocket.m from [ea3cfe401f] to [1ca1782d51].
| ︙ | ︙ | |||
12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h> #include <assert.h> #ifndef _WIN32 # include <netinet/in.h> # include <arpa/inet.h> | > > > | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #define __NO_EXT_QNX #include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h> #include <assert.h> #ifndef _WIN32 # include <netinet/in.h> # include <arpa/inet.h> |
| ︙ | ︙ | |||
344 345 346 347 348 349 350 |
isListening = YES;
}
- (OFTCPSocket*)accept
{
OFTCPSocket *newsock;
| | > | | 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 |
isListening = YES;
}
- (OFTCPSocket*)accept
{
OFTCPSocket *newsock;
struct sockaddr_storage *addr;
socklen_t addrlen;
int s;
newsock = [[[isa alloc] init] autorelease];
addrlen = sizeof(struct sockaddr);
@try {
addr = [newsock allocMemoryWithSize: sizeof(struct sockaddr)];
} @catch (id e) {
[newsock release];
@throw e;
}
if ((s = accept(sock, (struct sockaddr*)addr,
&addrlen)) == INVALID_SOCKET) {
[newsock release];
@throw [OFAcceptFailedException newWithClass: isa
socket: self];
}
newsock->sock = s;
newsock->sockAddr = addr;
|
| ︙ | ︙ | |||
390 391 392 393 394 395 396 |
@throw [OFInvalidArgumentException newWithClass: isa
selector: _cmd];
#ifdef HAVE_THREADSAFE_GETADDRINFO
char *host = [self allocMemoryWithSize: NI_MAXHOST];
@try {
| | | | 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 |
@throw [OFInvalidArgumentException newWithClass: isa
selector: _cmd];
#ifdef HAVE_THREADSAFE_GETADDRINFO
char *host = [self allocMemoryWithSize: NI_MAXHOST];
@try {
if (getnameinfo((struct sockaddr*)sockAddr, sockAddrLen, host,
NI_MAXHOST, NULL, 0, NI_NUMERICHOST))
@throw [OFAddressTranslationFailedException
newWithClass: isa];
return [OFString stringWithCString: host];
} @finally {
[self freeMemory: host];
}
|
| ︙ | ︙ |
Modified src/OFThread.h from [a4a4af59a1] to [8b6bb2dcce].
| ︙ | ︙ | |||
84 85 86 87 88 89 90 | /** * \return A new, autoreleased thread */ + thread; /** | | | 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 | /** * \return A new, autoreleased thread */ + thread; /** * \param obj An object which is passed for use in the main method or nil * \return A new, autoreleased thread */ + threadWithObject: (id)obj; /** * Sets the Thread Local Storage for the specified key. * |
| ︙ | ︙ | |||
157 158 159 160 161 162 163 | * Terminates the current thread, letting it return the specified object. * * \param obj The object which the terminated thread will return */ + (void)terminateWithObject: (id)obj; /** | | | 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 | * Terminates the current thread, letting it return the specified object. * * \param obj The object which the terminated thread will return */ + (void)terminateWithObject: (id)obj; /** * \param obj An object which is passed for use in the main method or nil * \return An initialized OFThread. */ - initWithObject: (id)obj; /** * The main routine of the thread. You need to reimplement this! * |
| ︙ | ︙ |
Modified src/OFThread.m from [fd76b79d25] to [e52975424c].
| ︙ | ︙ | |||
12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #ifndef _WIN32 # include <unistd.h> # include <sched.h> #else # include <windows.h> #endif #import "OFThread.h" #import "OFList.h" #import "OFDate.h" #import "OFAutoreleasePool.h" #import "OFConditionBroadcastFailedException.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 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #define __NO_EXT_QNX #ifndef _WIN32 # include <unistd.h> # include <sched.h> #else # include <windows.h> #endif #if defined(OF_GNU_RUNTIME) || defined(OF_OLD_GNU_RUNTIME) # import <objc/thr.h> #endif #import "OFThread.h" #import "OFList.h" #import "OFDate.h" #import "OFAutoreleasePool.h" #import "OFConditionBroadcastFailedException.h" |
| ︙ | ︙ | |||
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 |
static OFList *tlskeys;
static of_tlskey_t thread_self;
static id
call_main(id obj)
{
if (!of_tlskey_set(thread_self, obj))
@throw [OFInitializationFailedException
newWithClass: [obj class]];
/*
* Nasty workaround for thread implementations which can't return a
* value on join.
*/
((OFThread*)obj)->retval = [[obj main] retain];
[obj handleTermination];
((OFThread*)obj)->running = OF_THREAD_WAITING_FOR_JOIN;
[OFTLSKey callAllDestructors];
[OFAutoreleasePool releaseAll];
[obj release];
return 0;
}
@implementation OFThread
+ (void)initialize
{
| > > > > > > > > | 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 |
static OFList *tlskeys;
static of_tlskey_t thread_self;
static id
call_main(id obj)
{
#if defined(OF_GNU_RUNTIME) || defined(OF_OLD_GNU_RUNTIME)
objc_thread_add();
#endif
if (!of_tlskey_set(thread_self, obj))
@throw [OFInitializationFailedException
newWithClass: [obj class]];
/*
* Nasty workaround for thread implementations which can't return a
* value on join.
*/
((OFThread*)obj)->retval = [[obj main] retain];
[obj handleTermination];
((OFThread*)obj)->running = OF_THREAD_WAITING_FOR_JOIN;
[OFTLSKey callAllDestructors];
[OFAutoreleasePool releaseAll];
[obj release];
#if defined(OF_GNU_RUNTIME) || defined(OF_OLD_GNU_RUNTIME)
objc_thread_remove();
#endif
return 0;
}
@implementation OFThread
+ (void)initialize
{
|
| ︙ | ︙ | |||
204 205 206 207 208 209 210 211 212 213 214 215 216 217 |
thread->running = OF_THREAD_WAITING_FOR_JOIN;
}
[OFTLSKey callAllDestructors];
[OFAutoreleasePool releaseAll];
[thread release];
of_thread_exit();
}
- initWithObject: (id)obj
{
self = [super init];
| > > > > | 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 |
thread->running = OF_THREAD_WAITING_FOR_JOIN;
}
[OFTLSKey callAllDestructors];
[OFAutoreleasePool releaseAll];
[thread release];
#if defined(OF_GNU_RUNTIME) || defined(OF_OLD_GNU_RUNTIME)
objc_thread_remove();
#endif
of_thread_exit();
}
- initWithObject: (id)obj
{
self = [super init];
|
| ︙ | ︙ | |||
239 240 241 242 243 244 245 246 247 248 249 250 251 252 |
}
- (void)start
{
if (running == OF_THREAD_RUNNING)
@throw [OFThreadStillRunningException newWithClass: isa
thread: self];
[self retain];
if (!of_thread_new(&thread, call_main, self)) {
[self release];
@throw [OFThreadStartFailedException newWithClass: isa
thread: self];
| > > > > > | 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 |
}
- (void)start
{
if (running == OF_THREAD_RUNNING)
@throw [OFThreadStillRunningException newWithClass: isa
thread: self];
if (running == OF_THREAD_WAITING_FOR_JOIN) {
of_thread_detach(thread);
[retval release];
}
[self retain];
if (!of_thread_new(&thread, call_main, self)) {
[self release];
@throw [OFThreadStartFailedException newWithClass: isa
thread: self];
|
| ︙ | ︙ | |||
268 269 270 271 272 273 274 275 276 277 278 279 280 281 |
- (void)dealloc
{
if (running == OF_THREAD_RUNNING)
@throw [OFThreadStillRunningException newWithClass: isa
thread: self];
[object release];
[retval release];
[super dealloc];
}
@end
| > > > > > > > | 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 |
- (void)dealloc
{
if (running == OF_THREAD_RUNNING)
@throw [OFThreadStillRunningException newWithClass: isa
thread: self];
/*
* We should not be running anymore, but call detach in order to free
* the resources.
*/
if (running == OF_THREAD_WAITING_FOR_JOIN)
of_thread_detach(thread);
[object release];
[retval release];
[super dealloc];
}
@end
|
| ︙ | ︙ |
Modified src/OFURL.m from [ae9145fa4e] to [e8ba92cbd3].
| ︙ | ︙ | |||
157 158 159 160 161 162 163 | *tmp2 = '\0'; tmp2++; host = [[OFString alloc] initWithCString: str_c]; pool = [[OFAutoreleasePool alloc] init]; | | | 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 | *tmp2 = '\0'; tmp2++; host = [[OFString alloc] initWithCString: str_c]; pool = [[OFAutoreleasePool alloc] init]; port_str = [OFString stringWithCString: tmp2]; if ([port_str decimalValue] > 65535) @throw [OFInvalidFormatException newWithClass: isa]; port = [port_str decimalValue]; |
| ︙ | ︙ | |||
314 315 316 317 318 319 320 | if (![url->scheme isEqual: scheme]) return NO; if (![url->host isEqual: host]) return NO; if (url->port != port) return NO; | | | > | | | | 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 |
if (![url->scheme isEqual: scheme])
return NO;
if (![url->host isEqual: host])
return NO;
if (url->port != port)
return NO;
if (url->user != user && ![url->user isEqual: user])
return NO;
if (url->password != password && ![url->password isEqual: password])
return NO;
if (![url->path isEqual: path])
return NO;
if (url->parameters != parameters &&
![url->parameters isEqual: parameters])
return NO;
if (url->query != query && ![url->query isEqual: query])
return NO;
if (url->fragment != fragment && ![url->fragment isEqual: fragment])
return NO;
return YES;
}
- (uint32_t)hash
{
|
| ︙ | ︙ | |||
358 359 360 361 362 363 364 |
return hash;
}
- copy
{
OFURL *new = [[OFURL alloc] init];
| > | | | | | | | | | > > > > | 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 |
return hash;
}
- copy
{
OFURL *new = [[OFURL alloc] init];
@try {
new->scheme = [scheme copy];
new->host = [host copy];
new->port = port;
new->user = [user copy];
new->password = [password copy];
new->path = [path copy];
new->parameters = [parameters copy];
new->query = [query copy];
new->fragment = [fragment copy];
} @catch (id e) {
[new release];
@throw e;
}
return new;
}
- (OFString*)scheme
{
OF_GETTER(scheme, YES)
|
| ︙ | ︙ |
Modified src/OFXMLAttribute.m from [1771d20c62] to [8ed5b9d71d].
| ︙ | ︙ | |||
15 16 17 18 19 20 21 22 23 24 25 26 27 28 |
*/
#include "config.h"
#import "OFXMLAttribute.h"
#import "OFString.h"
#import "OFAutoreleasePool.h"
@implementation OFXMLAttribute
+ attributeWithName: (OFString*)name
namespace: (OFString*)ns
stringValue: (OFString*)value
{
return [[[self alloc] initWithName: name
| > > | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 |
*/
#include "config.h"
#import "OFXMLAttribute.h"
#import "OFString.h"
#import "OFAutoreleasePool.h"
#import "macros.h"
@implementation OFXMLAttribute
+ attributeWithName: (OFString*)name
namespace: (OFString*)ns
stringValue: (OFString*)value
{
return [[[self alloc] initWithName: name
|
| ︙ | ︙ | |||
67 68 69 70 71 72 73 74 |
return [[ns copy] autorelease];
}
- (OFString*)stringValue
{
return [[stringValue copy] autorelease];
}
@end
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 129 130 |
return [[ns copy] autorelease];
}
- (OFString*)stringValue
{
return [[stringValue copy] autorelease];
}
- (BOOL)isEqual: (id)object
{
OFXMLAttribute *other;
if (![object isKindOfClass: [OFXMLAttribute class]])
return NO;
other = object;
if (![other->name isEqual: name])
return NO;
if (other->ns != ns && ![other->ns isEqual: ns])
return NO;
if (![other->stringValue isEqual: stringValue])
return NO;
return YES;
}
- (uint32_t)hash
{
uint32_t hash, tmp;
OF_HASH_INIT(hash);
tmp = [name hash];
OF_HASH_ADD(hash, (tmp >> 24) & 0xFF);
OF_HASH_ADD(hash, (tmp >> 16) & 0xFF);
OF_HASH_ADD(hash, (tmp >> 8) & 0xFF);
OF_HASH_ADD(hash, tmp & 0xFF);
tmp = [name hash];
OF_HASH_ADD(hash, (tmp >> 24) & 0xFF);
OF_HASH_ADD(hash, (tmp >> 16) & 0xFF);
OF_HASH_ADD(hash, (tmp >> 8) & 0xFF);
OF_HASH_ADD(hash, tmp & 0xFF);
tmp = [ns hash];
OF_HASH_ADD(hash, (tmp >> 24) & 0xFF);
OF_HASH_ADD(hash, (tmp >> 16) & 0xFF);
OF_HASH_ADD(hash, (tmp >> 8) & 0xFF);
OF_HASH_ADD(hash, tmp & 0xFF);
tmp = [stringValue hash];
OF_HASH_ADD(hash, (tmp >> 24) & 0xFF);
OF_HASH_ADD(hash, (tmp >> 16) & 0xFF);
OF_HASH_ADD(hash, (tmp >> 8) & 0xFF);
OF_HASH_ADD(hash, tmp & 0xFF);
OF_HASH_FINALIZE(hash);
return hash;
}
@end
|
Modified src/OFXMLElement.h from [11b7a22a69] to [2bd5b1c182].
| ︙ | ︙ | |||
11 12 13 14 15 16 17 18 19 20 21 22 23 | * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #import "OFObject.h" @class OFString; @class OFArray; @class OFMutableString; @class OFMutableArray; @class OFMutableDictionary; | > < | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 |
* Alternatively, it may be distributed under the terms of the GNU General
* Public License, either version 2 or 3, which can be found in the file
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
#import "OFObject.h"
#import "OFXMLAttribute.h"
@class OFString;
@class OFArray;
@class OFMutableString;
@class OFMutableArray;
@class OFMutableDictionary;
/**
* \brief A class which stores an XML element.
*/
@interface OFXMLElement: OFObject
{
OFString *name;
|
| ︙ | ︙ | |||
323 324 325 326 327 328 329 |
* \param prefix The prefix for the namespace
* \param ns The namespace for which the prefix is bound
*/
- (void)bindPrefix: (OFString*)prefix
forNamespace: (OFString*)ns;
/**
| | | 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 |
* \param prefix The prefix for the namespace
* \param ns The namespace for which the prefix is bound
*/
- (void)bindPrefix: (OFString*)prefix
forNamespace: (OFString*)ns;
/**
* Sets the default namespace for the element to be used if there is no parent.
*
* \param ns The default namespace for the element
*/
- (void)setDefaultNamespace: (OFString*)ns;
/**
* Adds a child to the OFXMLElement.
|
| ︙ | ︙ |
Modified src/OFXMLElement.m from [1d2471d4ea] to [dc999e1b97].
| ︙ | ︙ | |||
28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 |
#import "OFXMLElementBuilder.h"
#import "OFAutoreleasePool.h"
#import "OFInvalidArgumentException.h"
#import "OFMalformedXMLException.h"
#import "OFNotImplementedException.h"
#import "OFUnboundNamespaceException.h"
@interface OFXMLElement_OFXMLElementBuilderDelegate: OFObject
{
@public
OFXMLElement *element;
}
@end
@implementation OFXMLElement_OFXMLElementBuilderDelegate
- (void)elementBuilder: (OFXMLElementBuilder*)builder
didBuildElement: (OFXMLElement*)elem
{
| > > > > > > > > | > | 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 |
#import "OFXMLElementBuilder.h"
#import "OFAutoreleasePool.h"
#import "OFInvalidArgumentException.h"
#import "OFMalformedXMLException.h"
#import "OFNotImplementedException.h"
#import "OFUnboundNamespaceException.h"
#import "macros.h"
@interface OFXMLElement_OFXMLElementBuilderDelegate: OFObject
{
@public
OFXMLElement *element;
}
@end
@implementation OFXMLElement_OFXMLElementBuilderDelegate
- (void)elementBuilder: (OFXMLElementBuilder*)builder
didBuildElement: (OFXMLElement*)elem
{
/*
* Make sure we don't take whitespaces before or after the root element
* into account.
*/
if ([elem name] != nil) {
assert(element == nil);
element = [elem retain];
}
}
- (void)dealloc
{
[element release];
[super dealloc];
|
| ︙ | ︙ | |||
210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 |
- initWithXMLString: (OFString*)str
{
OFAutoreleasePool *pool;
OFXMLParser *parser;
OFXMLElementBuilder *builder;
OFXMLElement_OFXMLElementBuilderDelegate *delegate;
[self release];
pool = [[OFAutoreleasePool alloc] init];
parser = [OFXMLParser parser];
builder = [OFXMLElementBuilder elementBuilder];
delegate = [[[OFXMLElement_OFXMLElementBuilderDelegate alloc] init]
autorelease];
[parser setDelegate: builder];
[builder setDelegate: delegate];
[parser parseString: str];
if (![parser finishedParsing])
| > > | | 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 |
- initWithXMLString: (OFString*)str
{
OFAutoreleasePool *pool;
OFXMLParser *parser;
OFXMLElementBuilder *builder;
OFXMLElement_OFXMLElementBuilderDelegate *delegate;
Class c;
c = isa;
[self release];
pool = [[OFAutoreleasePool alloc] init];
parser = [OFXMLParser parser];
builder = [OFXMLElementBuilder elementBuilder];
delegate = [[[OFXMLElement_OFXMLElementBuilderDelegate alloc] init]
autorelease];
[parser setDelegate: builder];
[builder setDelegate: delegate];
[parser parseString: str];
if (![parser finishedParsing])
@throw [OFMalformedXMLException newWithClass: c
parser: parser];
self = [delegate->element retain];
@try {
[pool release];
} @catch (id e) {
|
| ︙ | ︙ | |||
322 323 324 325 326 327 328 329 330 331 332 333 334 335 |
* would create a real copy each time -[copy] is called.
*/
ret->isa = [OFString class];
return ret;
}
- (OFString*)_XMLStringWithParent: (OFXMLElement*)parent
{
OFAutoreleasePool *pool, *pool2;
char *str_c;
size_t len, i, j, attrs_count;
OFString *prefix, *parent_prefix;
OFXMLAttribute **attrs_carray;
OFString *ret, *tmp;
| > < | 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 |
* would create a real copy each time -[copy] is called.
*/
ret->isa = [OFString class];
return ret;
}
- (OFString*)_XMLStringWithParent: (OFXMLElement*)parent
namespaces: (OFDictionary*)all_namespaces
{
OFAutoreleasePool *pool, *pool2;
char *str_c;
size_t len, i, j, attrs_count;
OFString *prefix, *parent_prefix;
OFXMLAttribute **attrs_carray;
OFString *ret, *tmp;
OFString *def_ns;
if (characters != nil)
return [characters stringByXMLEscaping];
if (cdata != nil)
return [OFString stringWithFormat: @"<![CDATA[%@]]>", cdata];
|
| ︙ | ︙ | |||
356 357 358 359 360 361 362 | * -[copy] is called. */ str->isa = [OFString class]; return str; } pool = [[OFAutoreleasePool alloc] init]; | | | | | > | | | > > | | > > > > > | < < | < | < < | 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 |
* -[copy] is called.
*/
str->isa = [OFString class];
return str;
}
pool = [[OFAutoreleasePool alloc] init];
parent_prefix = [all_namespaces objectForKey:
(parent != nil && parent->ns != nil ? parent->ns : (OFString*)@"")];
if (all_namespaces != nil) {
OFEnumerator *key_enum = [namespaces keyEnumerator];
OFEnumerator *obj_enum = [namespaces objectEnumerator];
OFMutableDictionary *mutable;
id key, obj;
mutable = [[all_namespaces mutableCopy] autorelease];
while ((key = [key_enum nextObject]) != nil &&
(obj = [obj_enum nextObject]) != nil)
[mutable setObject: obj
forKey: key];
all_namespaces = mutable;
} else
all_namespaces = namespaces;
prefix = [all_namespaces objectForKey:
(ns != nil ? ns : (OFString*)@"")];
if (parent != nil && parent->ns != nil && parent_prefix == nil)
def_ns = parent->ns;
else if (parent != nil && parent->defaultNamespace != nil)
def_ns = parent->defaultNamespace;
else
def_ns = defaultNamespace;
i = 0;
len = [name cStringLength] + 3;
str_c = [self allocMemoryWithSize: len];
/* Start of tag */
str_c[i++] = '<';
if (prefix != nil && ![ns isEqual: def_ns]) {
len += [prefix cStringLength] + 1;
@try {
str_c = [self resizeMemory: str_c
toSize: len];
} @catch (id e) {
[self freeMemory: str_c];
@throw e;
}
memcpy(str_c + i, [prefix cString],
[prefix cStringLength]);
i += [prefix cStringLength];
str_c[i++] = ':';
}
memcpy(str_c + i, [name cString], [name cStringLength]);
i += [name cStringLength];
/* xmlns if necessary */
if (prefix == nil && ((ns != nil && ![ns isEqual: def_ns]) ||
(ns == nil && def_ns != nil))) {
len += [ns cStringLength] + 9;
@try {
str_c = [self resizeMemory: str_c
toSize: len];
} @catch (id e) {
[self freeMemory: str_c];
@throw e;
}
memcpy(str_c + i, " xmlns='", 8);
i += 8;
memcpy(str_c + i, [ns cString], [ns cStringLength]);
i += [ns cStringLength];
str_c[i++] = '\'';
}
/* Attributes */
attrs_carray = [attributes cArray];
attrs_count = [attributes count];
pool2 = [[OFAutoreleasePool alloc] init];
|
| ︙ | ︙ | |||
492 493 494 495 496 497 498 | append = [tmp methodForSelector: @selector(appendCStringWithoutUTF8Checking:)]; for (j = 0; j < children_count; j++) append(tmp, @selector( appendCStringWithoutUTF8Checking:), [[children_carray[j] | | > | 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 |
append = [tmp methodForSelector:
@selector(appendCStringWithoutUTF8Checking:)];
for (j = 0; j < children_count; j++)
append(tmp, @selector(
appendCStringWithoutUTF8Checking:),
[[children_carray[j]
_XMLStringWithParent: self
namespaces: all_namespaces] cString]);
len += [tmp cStringLength] + [name cStringLength] + 2;
@try {
str_c = [self resizeMemory: str_c
toSize: len];
} @catch (id e) {
[self freeMemory: str_c];
|
| ︙ | ︙ | |||
544 545 546 547 548 549 550 |
[self freeMemory: str_c];
}
return ret;
}
- (OFString*)XMLString
{
| | > | 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 |
[self freeMemory: str_c];
}
return ret;
}
- (OFString*)XMLString
{
return [self _XMLStringWithParent: nil
namespaces: nil];
}
- (OFString*)description
{
return [self XMLString];
}
|
| ︙ | ︙ | |||
746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 |
if (children_c[i]->ns == nil &&
[children_c[i]->name isEqual: elemname])
[ret addObject: children_c[i]];
}
return ret;
}
- (void)dealloc
{
[name release];
[ns release];
[attributes release];
[namespaces release];
[children release];
[characters release];
[cdata release];
[comment release];
[super dealloc];
}
@end
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 |
if (children_c[i]->ns == nil &&
[children_c[i]->name isEqual: elemname])
[ret addObject: children_c[i]];
}
return ret;
}
- (BOOL)isEqual: (id)object
{
OFXMLElement *other;
if (![object isKindOfClass: [OFXMLElement class]])
return NO;
other = object;
if (other->name != name && ![other->name isEqual: name])
return NO;
if (other->ns != ns && ![other->ns isEqual: ns])
return NO;
if (other->defaultNamespace != defaultNamespace &&
![other->defaultNamespace isEqual: defaultNamespace])
return NO;
if (other->attributes != attributes &&
![other->attributes isEqual: attributes])
return NO;
if (other->namespaces != namespaces &&
![other->namespaces isEqual: namespaces])
return NO;
if (other->children != children && ![other->children isEqual: children])
return NO;
if (other->characters != characters &&
![other->characters isEqual: characters])
return NO;
if (other->cdata != cdata && ![other->cdata isEqual: cdata])
return NO;
if (other->comment != comment && ![other->comment isEqual: comment])
return NO;
return YES;
}
- (uint32_t)hash
{
uint32_t hash, tmp;
OF_HASH_INIT(hash);
tmp = [name hash];
OF_HASH_ADD(hash, (tmp >> 24) & 0xFF);
OF_HASH_ADD(hash, (tmp >> 16) & 0xFF);
OF_HASH_ADD(hash, (tmp >> 8) & 0xFF);
OF_HASH_ADD(hash, tmp & 0xFF);
tmp = [ns hash];
OF_HASH_ADD(hash, (tmp >> 24) & 0xFF);
OF_HASH_ADD(hash, (tmp >> 16) & 0xFF);
OF_HASH_ADD(hash, (tmp >> 8) & 0xFF);
OF_HASH_ADD(hash, tmp & 0xFF);
tmp = [defaultNamespace hash];
OF_HASH_ADD(hash, (tmp >> 24) & 0xFF);
OF_HASH_ADD(hash, (tmp >> 16) & 0xFF);
OF_HASH_ADD(hash, (tmp >> 8) & 0xFF);
OF_HASH_ADD(hash, tmp & 0xFF);
tmp = [attributes hash];
OF_HASH_ADD(hash, (tmp >> 24) & 0xFF);
OF_HASH_ADD(hash, (tmp >> 16) & 0xFF);
OF_HASH_ADD(hash, (tmp >> 8) & 0xFF);
OF_HASH_ADD(hash, tmp & 0xFF);
tmp = [namespaces hash];
OF_HASH_ADD(hash, (tmp >> 24) & 0xFF);
OF_HASH_ADD(hash, (tmp >> 16) & 0xFF);
OF_HASH_ADD(hash, (tmp >> 8) & 0xFF);
OF_HASH_ADD(hash, tmp & 0xFF);
tmp = [children hash];
OF_HASH_ADD(hash, (tmp >> 24) & 0xFF);
OF_HASH_ADD(hash, (tmp >> 16) & 0xFF);
OF_HASH_ADD(hash, (tmp >> 8) & 0xFF);
OF_HASH_ADD(hash, tmp & 0xFF);
tmp = [characters hash];
OF_HASH_ADD(hash, (tmp >> 24) & 0xFF);
OF_HASH_ADD(hash, (tmp >> 16) & 0xFF);
OF_HASH_ADD(hash, (tmp >> 8) & 0xFF);
OF_HASH_ADD(hash, tmp & 0xFF);
tmp = [cdata hash];
OF_HASH_ADD(hash, (tmp >> 24) & 0xFF);
OF_HASH_ADD(hash, (tmp >> 16) & 0xFF);
OF_HASH_ADD(hash, (tmp >> 8) & 0xFF);
OF_HASH_ADD(hash, tmp & 0xFF);
tmp = [comment hash];
OF_HASH_ADD(hash, (tmp >> 24) & 0xFF);
OF_HASH_ADD(hash, (tmp >> 16) & 0xFF);
OF_HASH_ADD(hash, (tmp >> 8) & 0xFF);
OF_HASH_ADD(hash, tmp & 0xFF);
OF_HASH_FINALIZE(hash);
return hash;
}
- (void)dealloc
{
[name release];
[ns release];
[defaultNamespace release];
[attributes release];
[namespaces release];
[children release];
[characters release];
[cdata release];
[comment release];
[super dealloc];
}
@end
|
Modified src/OFXMLParser.h from [4bfeec9a6e] to [0a269ecfb6].
| ︙ | ︙ | |||
175 176 177 178 179 180 181 182 183 184 185 186 187 188 | of_xml_parser_element_end_block_t elementEndHandler; of_xml_parser_string_block_t charactersHandler; of_xml_parser_string_block_t CDATAHandler; of_xml_parser_string_block_t commentHandler; of_xml_parser_unknown_entity_block_t unknownEntityHandler; #endif size_t level; size_t lineNumber; BOOL lastCarriageReturn; BOOL finishedParsing; } #ifdef OF_HAVE_PROPERTIES @property (retain) id <OFXMLParserDelegate> delegate; | > | 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 | of_xml_parser_element_end_block_t elementEndHandler; of_xml_parser_string_block_t charactersHandler; of_xml_parser_string_block_t CDATAHandler; of_xml_parser_string_block_t commentHandler; of_xml_parser_unknown_entity_block_t unknownEntityHandler; #endif size_t level; BOOL acceptProlog; size_t lineNumber; BOOL lastCarriageReturn; BOOL finishedParsing; } #ifdef OF_HAVE_PROPERTIES @property (retain) id <OFXMLParserDelegate> delegate; |
| ︙ | ︙ |
Modified src/OFXMLParser.m from [e1f46dcc8c] to [327f362f7a].
| ︙ | ︙ | |||
15 16 17 18 19 20 21 | */ #include "config.h" #define OF_XML_PARSER_M #include <string.h> | > | | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 | */ #include "config.h" #define OF_XML_PARSER_M #include <string.h> #include <sys/types.h> #import "OFXMLParser.h" #import "OFString.h" #import "OFArray.h" #import "OFDictionary.h" #import "OFXMLAttribute.h" #import "OFStream.h" |
| ︙ | ︙ | |||
47 48 49 50 51 52 53 | [cache replaceOccurrencesOfString: @"\r\n" withString: @"\n"]; [cache replaceOccurrencesOfString: @"\r" withString: @"\n"]; return [cache stringByXMLUnescapingWithDelegate: delegate]; } | | | 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 |
[cache replaceOccurrencesOfString: @"\r\n"
withString: @"\n"];
[cache replaceOccurrencesOfString: @"\r"
withString: @"\n"];
return [cache stringByXMLUnescapingWithDelegate: delegate];
}
static OFString*
namespace_for_prefix(OFString *prefix, OFArray *namespaces)
{
OFDictionary **carray = [namespaces cArray];
ssize_t i;
if (prefix == nil)
prefix = @"";
|
| ︙ | ︙ | |||
153 154 155 156 157 158 159 160 161 162 163 164 165 166 |
pool = [[OFAutoreleasePool alloc] init];
dict = [OFMutableDictionary dictionaryWithKeysAndObjects:
@"xml", @"http://www.w3.org/XML/1998/namespace",
@"xmlns", @"http://www.w3.org/2000/xmlns/", nil];
[namespaces addObject: dict];
lineNumber = 1;
[pool release];
} @catch (id e) {
[self release];
@throw e;
}
| > | 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 |
pool = [[OFAutoreleasePool alloc] init];
dict = [OFMutableDictionary dictionaryWithKeysAndObjects:
@"xml", @"http://www.w3.org/XML/1998/namespace",
@"xmlns", @"http://www.w3.org/2000/xmlns/", nil];
[namespaces addObject: dict];
acceptProlog = YES;
lineNumber = 1;
[pool release];
} @catch (id e) {
[self release];
@throw e;
}
|
| ︙ | ︙ | |||
263 264 265 266 267 268 269 |
} @finally {
[file release];
}
}
/*
* The following methods handle the different states of the parser. They are
| | | | > | 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 |
} @finally {
[file release];
}
}
/*
* The following methods handle the different states of the parser. They are
* looked up in +[initialize] and put in a lookup table to speed things up.
* One dispatch for every character would be way too slow!
*/
/* Not in a tag */
- (void)_parseOutsideTagWithBuffer: (const char*)buf
i: (size_t*)i
last: (size_t*)last
{
size_t len;
if ((finishedParsing || [previous count] < 1) && buf[*i] != ' ' &&
buf[*i] != '\t' && buf[*i] != '\n' && buf[*i] != '\r' &&
buf[*i] != '<')
@throw [OFMalformedXMLException newWithClass: isa
parser: self];
if (buf[*i] != '<')
return;
if ((len = *i - *last) > 0)
|
| ︙ | ︙ | |||
315 316 317 318 319 320 321 |
}
/* Tag was just opened */
- (void)_parseTagOpenedWithBuffer: (const char*)buf
i: (size_t*)i
last: (size_t*)last
{
| | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | 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 355 356 357 358 359 360 361 362 363 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 |
}
/* Tag was just opened */
- (void)_parseTagOpenedWithBuffer: (const char*)buf
i: (size_t*)i
last: (size_t*)last
{
if (finishedParsing && buf[*i] != '!' && buf[*i] != '?')
@throw [OFMalformedXMLException newWithClass: isa
parser: self];
switch (buf[*i]) {
case '?':
*last = *i + 1;
state = OF_XMLPARSER_IN_PROCESSING_INSTRUCTIONS;
level = 0;
break;
case '/':
*last = *i + 1;
state = OF_XMLPARSER_IN_CLOSE_TAG_NAME;
acceptProlog = NO;
break;
case '!':
*last = *i + 1;
state = OF_XMLPARSER_IN_EXCLAMATIONMARK;
acceptProlog = NO;
break;
default:
state = OF_XMLPARSER_IN_TAG_NAME;
acceptProlog = NO;
(*i)--;
break;
}
}
/* <?xml […]?> */
- (BOOL)_parseXMLProcessingInstructions: (OFString*)pi
{
const char *pi_c;
size_t i, last, pi_len;
int xstate = 0;
OFString *attr = nil;
OFString *val = nil;
char xdelim = 0;
if (!acceptProlog)
return NO;
acceptProlog = NO;
pi = [pi substringFromIndex: 3
toIndex: [pi length]];
pi = [pi stringByDeletingLeadingAndTrailingWhitespaces];
pi_c = [pi cString];
pi_len = [pi cStringLength];
for (i = last = 0; i < pi_len; i++) {
switch (xstate) {
case 0:
if (pi_c[i] == ' ' || pi_c[i] == '\t' ||
pi_c[i] == '\r' || pi_c[i] == '\n')
continue;
last = i;
xstate = 1;
i--;
break;
case 1:
if (pi_c[i] != '=')
continue;
attr = [OFString stringWithCString: pi_c + last
length: i - last];
last = i + 1;
xstate = 2;
break;
case 2:
if (pi_c[i] != '\'' && pi_c[i] != '"')
return NO;
xdelim = pi_c[i];
last = i + 1;
xstate = 3;
break;
case 3:
if (pi_c[i] != xdelim)
continue;
val = [OFString stringWithCString: pi_c + last
length: i - last];
if ([attr isEqual: @"version"])
if (![val hasPrefix: @"1."])
return NO;
if ([attr isEqual: @"encoding"])
if ([val caseInsensitiveCompare: @"utf-8"] !=
OF_ORDERED_SAME)
return NO;
last = i + 1;
xstate = 0;
break;
}
}
if (xstate != 0)
return NO;
return YES;
}
/* Inside processing instructions */
- (void)_parseInProcessingInstructionsWithBuffer: (const char*)buf
i: (size_t*)i
last: (size_t*)last
{
if (buf[*i] == '?')
level = 1;
else if (level == 1 && buf[*i] == '>') {
|
| ︙ | ︙ | |||
366 367 368 369 370 371 372 373 374 375 376 377 378 379 | /* * Class swizzle the string to be immutable. We pass it as * OFString*, so it can't be modified anyway. But not swizzling * it would create a real copy each time -[copy] is called. */ pi->isa = [OFString class]; [delegate parser: self foundProcessingInstructions: pi]; [pool release]; [cache setToCString: ""]; | > > > > > > > > | 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 | /* * Class swizzle the string to be immutable. We pass it as * OFString*, so it can't be modified anyway. But not swizzling * it would create a real copy each time -[copy] is called. */ pi->isa = [OFString class]; if ([pi isEqual: @"xml"] || [pi hasPrefix: @"xml "] || [pi hasPrefix: @"xml\t"] || [pi hasPrefix: @"xml\r"] || [pi hasPrefix: @"xml\n"]) if (![self _parseXMLProcessingInstructions: pi]) @throw [OFMalformedXMLException newWithClass: isa parser: self]; [delegate parser: self foundProcessingInstructions: pi]; [pool release]; [cache setToCString: ""]; |
| ︙ | ︙ | |||
444 445 446 447 448 449 450 451 452 453 454 455 456 457 | elementEndHandler(self, name, prefix, ns); else #endif [delegate parser: self didEndElement: name withPrefix: prefix namespace: ns]; } else [previous addObject: [[cache copy] autorelease]]; [pool release]; [name release]; [prefix release]; | > > > | 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 | elementEndHandler(self, name, prefix, ns); else #endif [delegate parser: self didEndElement: name withPrefix: prefix namespace: ns]; if ([previous count] == 0) finishedParsing = YES; } else [previous addObject: [[cache copy] autorelease]]; [pool release]; [name release]; [prefix release]; |
| ︙ | ︙ | |||
599 600 601 602 603 604 605 606 607 608 609 610 611 612 |
elementEndHandler(self, name, prefix, ns);
else
#endif
[delegate parser: self
didEndElement: name
withPrefix: prefix
namespace: ns];
[namespaces removeNObjects: 1];
} else if (prefix != nil) {
OFString *str = [OFString stringWithFormat: @"%@:%@",
prefix, name];
[previous addObject: str];
} else
| > > > | 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 |
elementEndHandler(self, name, prefix, ns);
else
#endif
[delegate parser: self
didEndElement: name
withPrefix: prefix
namespace: ns];
if ([previous count] == 0)
finishedParsing = YES;
[namespaces removeNObjects: 1];
} else if (prefix != nil) {
OFString *str = [OFString stringWithFormat: @"%@:%@",
prefix, name];
[previous addObject: str];
} else
|
| ︙ | ︙ |
Modified src/base64.m from [769602ecfc] to [795ed0f2f5].
| ︙ | ︙ | |||
100 101 102 103 104 105 106 107 108 109 110 111 112 113 |
of_base64_decode(OFDataArray *data, const char *str, size_t len)
{
const uint8_t *buf = (const uint8_t*)str;
size_t i;
if ((len & 3) != 0)
return NO;
for (i = 0; i < len; i += 4) {
uint32_t sb = 0;
uint8_t cnt = 3;
char db[3];
char tmp;
| > > > | 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 |
of_base64_decode(OFDataArray *data, const char *str, size_t len)
{
const uint8_t *buf = (const uint8_t*)str;
size_t i;
if ((len & 3) != 0)
return NO;
if ([data itemSize] != 1)
return NO;
for (i = 0; i < len; i += 4) {
uint32_t sb = 0;
uint8_t cnt = 3;
char db[3];
char tmp;
|
| ︙ | ︙ |
Modified src/exceptions/OFAcceptFailedException.m from [7e7f947ee7] to [ea651db91b].
| ︙ | ︙ | |||
14 15 16 17 18 19 20 21 22 23 24 25 26 27 | * file. */ #include "config.h" #import "OFAcceptFailedException.h" #import "OFString.h" #import "OFNotImplementedException.h" #import "common.h" @implementation OFAcceptFailedException + newWithClass: (Class)class_ | > | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | * file. */ #include "config.h" #import "OFAcceptFailedException.h" #import "OFString.h" #import "OFTCPSocket.h" #import "OFNotImplementedException.h" #import "common.h" @implementation OFAcceptFailedException + newWithClass: (Class)class_ |
| ︙ | ︙ |
Modified src/exceptions/OFAddressTranslationFailedException.m from [169c6cd7e2] to [934b14dab9].
| ︙ | ︙ | |||
14 15 16 17 18 19 20 21 22 23 24 25 26 27 | * file. */ #include "config.h" #import "OFAddressTranslationFailedException.h" #import "OFString.h" #import "common.h" @implementation OFAddressTranslationFailedException + newWithClass: (Class)class_ socket: (OFTCPSocket*)socket host: (OFString*)host | > | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | * file. */ #include "config.h" #import "OFAddressTranslationFailedException.h" #import "OFString.h" #import "OFTCPSocket.h" #import "common.h" @implementation OFAddressTranslationFailedException + newWithClass: (Class)class_ socket: (OFTCPSocket*)socket host: (OFString*)host |
| ︙ | ︙ |
Modified src/exceptions/OFAlreadyConnectedException.m from [8f294af99b] to [48d0714422].
| ︙ | ︙ | |||
14 15 16 17 18 19 20 21 22 23 24 25 26 27 |
* file.
*/
#include "config.h"
#import "OFAlreadyConnectedException.h"
#import "OFString.h"
#import "OFNotImplementedException.h"
@implementation OFAlreadyConnectedException
+ newWithClass: (Class)class_
socket: (OFTCPSocket*)socket
{
| > | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 |
* file.
*/
#include "config.h"
#import "OFAlreadyConnectedException.h"
#import "OFString.h"
#import "OFTCPSocket.h"
#import "OFNotImplementedException.h"
@implementation OFAlreadyConnectedException
+ newWithClass: (Class)class_
socket: (OFTCPSocket*)socket
{
|
| ︙ | ︙ |
Modified src/exceptions/OFBindFailedException.m from [618c1f8bd7] to [6af98418a1].
| ︙ | ︙ | |||
14 15 16 17 18 19 20 21 22 23 24 25 26 27 | * file. */ #include "config.h" #import "OFBindFailedException.h" #import "OFString.h" #import "OFNotImplementedException.h" #import "common.h" @implementation OFBindFailedException + newWithClass: (Class)class_ | > | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | * file. */ #include "config.h" #import "OFBindFailedException.h" #import "OFString.h" #import "OFTCPSocket.h" #import "OFNotImplementedException.h" #import "common.h" @implementation OFBindFailedException + newWithClass: (Class)class_ |
| ︙ | ︙ |
Modified src/exceptions/OFConditionBroadcastFailedException.m from [e2f7203d01] to [e42b4e7288].
| ︙ | ︙ | |||
14 15 16 17 18 19 20 21 22 23 24 25 26 27 |
* file.
*/
#include "config.h"
#import "OFConditionBroadcastFailedException.h"
#import "OFString.h"
#import "OFNotImplementedException.h"
@implementation OFConditionBroadcastFailedException
+ newWithClass: (Class)class_
condition: (OFCondition*)condition
{
| > | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 |
* file.
*/
#include "config.h"
#import "OFConditionBroadcastFailedException.h"
#import "OFString.h"
#import "OFThread.h"
#import "OFNotImplementedException.h"
@implementation OFConditionBroadcastFailedException
+ newWithClass: (Class)class_
condition: (OFCondition*)condition
{
|
| ︙ | ︙ |
Modified src/exceptions/OFConditionSignalFailedException.m from [18c8107daf] to [d5c9084025].
| ︙ | ︙ | |||
14 15 16 17 18 19 20 21 22 23 24 25 26 27 |
* file.
*/
#include "config.h"
#import "OFConditionSignalFailedException.h"
#import "OFString.h"
#import "OFNotImplementedException.h"
@implementation OFConditionSignalFailedException
+ newWithClass: (Class)class_
condition: (OFCondition*)condition
{
| > | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 |
* file.
*/
#include "config.h"
#import "OFConditionSignalFailedException.h"
#import "OFString.h"
#import "OFThread.h"
#import "OFNotImplementedException.h"
@implementation OFConditionSignalFailedException
+ newWithClass: (Class)class_
condition: (OFCondition*)condition
{
|
| ︙ | ︙ |
Modified src/exceptions/OFConditionStillWaitingException.m from [72bd604d13] to [842bbabb44].
| ︙ | ︙ | |||
14 15 16 17 18 19 20 21 22 23 24 25 26 27 |
* file.
*/
#include "config.h"
#import "OFConditionStillWaitingException.h"
#import "OFString.h"
#import "OFNotImplementedException.h"
@implementation OFConditionStillWaitingException
+ newWithClass: (Class)class_
condition: (OFCondition*)condition
{
| > | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 |
* file.
*/
#include "config.h"
#import "OFConditionStillWaitingException.h"
#import "OFString.h"
#import "OFThread.h"
#import "OFNotImplementedException.h"
@implementation OFConditionStillWaitingException
+ newWithClass: (Class)class_
condition: (OFCondition*)condition
{
|
| ︙ | ︙ |
Modified src/exceptions/OFConditionWaitFailedException.m from [395ad03884] to [8a702fc8e7].
| ︙ | ︙ | |||
14 15 16 17 18 19 20 21 22 23 24 25 26 27 |
* file.
*/
#include "config.h"
#import "OFConditionWaitFailedException.h"
#import "OFString.h"
#import "OFNotImplementedException.h"
@implementation OFConditionWaitFailedException
+ newWithClass: (Class)class_
condition: (OFCondition*)condition
{
| > | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 |
* file.
*/
#include "config.h"
#import "OFConditionWaitFailedException.h"
#import "OFString.h"
#import "OFThread.h"
#import "OFNotImplementedException.h"
@implementation OFConditionWaitFailedException
+ newWithClass: (Class)class_
condition: (OFCondition*)condition
{
|
| ︙ | ︙ |
Modified src/exceptions/OFConnectionFailedException.m from [5af8de549d] to [4942ddb4be].
| ︙ | ︙ | |||
14 15 16 17 18 19 20 21 22 23 24 25 26 27 | * file. */ #include "config.h" #import "OFConnectionFailedException.h" #import "OFString.h" #import "OFNotImplementedException.h" #import "common.h" @implementation OFConnectionFailedException + newWithClass: (Class)class_ | > | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | * file. */ #include "config.h" #import "OFConnectionFailedException.h" #import "OFString.h" #import "OFTCPSocket.h" #import "OFNotImplementedException.h" #import "common.h" @implementation OFConnectionFailedException + newWithClass: (Class)class_ |
| ︙ | ︙ | |||
73 74 75 76 77 78 79 |
- (OFString*)description
{
if (description != nil)
return description;
description = [[OFString alloc] initWithFormat:
| | | | 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 |
- (OFString*)description
{
if (description != nil)
return description;
description = [[OFString alloc] initWithFormat:
@"A connection to %@ on port %" @PRIu16 @" could not be "
@"established in class %@! " ERRFMT, host, port, inClass, ERRPARAM];
return description;
}
- (OFTCPSocket*)socket
{
return socket;
|
| ︙ | ︙ |
Modified src/exceptions/OFCopyFileFailedException.m from [da0c6a5cd9] to [b4ff248d49].
| ︙ | ︙ | |||
85 86 87 88 89 90 91 |
}
- (OFString*)sourcePath
{
return sourcePath;
}
| | | 85 86 87 88 89 90 91 92 93 94 95 96 |
}
- (OFString*)sourcePath
{
return sourcePath;
}
- (OFString*)destinationPath
{
return destinationPath;
}
@end
|
Modified src/exceptions/OFHashAlreadyCalculatedException.m from [2396ce4fe7] to [0923b30e46].
| ︙ | ︙ | |||
14 15 16 17 18 19 20 21 22 23 24 25 26 27 |
* file.
*/
#include "config.h"
#import "OFHashAlreadyCalculatedException.h"
#import "OFString.h"
#import "OFNotImplementedException.h"
@implementation OFHashAlreadyCalculatedException
+ newWithClass: (Class)class_
hash: (OFHash*)hash
{
| > | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 |
* file.
*/
#include "config.h"
#import "OFHashAlreadyCalculatedException.h"
#import "OFString.h"
#import "OFHash.h"
#import "OFNotImplementedException.h"
@implementation OFHashAlreadyCalculatedException
+ newWithClass: (Class)class_
hash: (OFHash*)hash
{
|
| ︙ | ︙ |
Modified src/exceptions/OFListenFailedException.m from [98f4572f60] to [050e526b82].
| ︙ | ︙ | |||
14 15 16 17 18 19 20 21 22 23 24 25 26 27 | * file. */ #include "config.h" #import "OFListenFailedException.h" #import "OFString.h" #import "OFNotImplementedException.h" #import "common.h" @implementation OFListenFailedException + newWithClass: (Class)class_ | > | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | * file. */ #include "config.h" #import "OFListenFailedException.h" #import "OFString.h" #import "OFTCPSocket.h" #import "OFNotImplementedException.h" #import "common.h" @implementation OFListenFailedException + newWithClass: (Class)class_ |
| ︙ | ︙ |
Modified src/exceptions/OFMalformedXMLException.m from [ca2ee2fed4] to [4aa8a7f2e3].
| ︙ | ︙ | |||
14 15 16 17 18 19 20 21 22 23 24 25 26 27 |
* file.
*/
#include "config.h"
#import "OFMalformedXMLException.h"
#import "OFString.h"
#import "OFNotImplementedException.h"
@implementation OFMalformedXMLException
+ newWithClass: (Class)class_
parser: (OFXMLParser*)parser
{
| > | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 |
* file.
*/
#include "config.h"
#import "OFMalformedXMLException.h"
#import "OFString.h"
#import "OFXMLParser.h"
#import "OFNotImplementedException.h"
@implementation OFMalformedXMLException
+ newWithClass: (Class)class_
parser: (OFXMLParser*)parser
{
|
| ︙ | ︙ |
Modified src/exceptions/OFMutexLockFailedException.m from [b44ad10d78] to [6cdc6df2bc].
| ︙ | ︙ | |||
14 15 16 17 18 19 20 21 22 23 24 25 26 27 |
* file.
*/
#include "config.h"
#import "OFMutexLockFailedException.h"
#import "OFString.h"
#import "OFNotImplementedException.h"
@implementation OFMutexLockFailedException
+ newWithClass: (Class)class_
mutex: (OFMutex*)mutex
{
| > | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 |
* file.
*/
#include "config.h"
#import "OFMutexLockFailedException.h"
#import "OFString.h"
#import "OFThread.h"
#import "OFNotImplementedException.h"
@implementation OFMutexLockFailedException
+ newWithClass: (Class)class_
mutex: (OFMutex*)mutex
{
|
| ︙ | ︙ |
Modified src/exceptions/OFMutexStillLockedException.m from [c55164b0a2] to [149190a6c2].
| ︙ | ︙ | |||
14 15 16 17 18 19 20 21 22 23 24 25 26 27 |
* file.
*/
#include "config.h"
#import "OFMutexStillLockedException.h"
#import "OFString.h"
#import "OFNotImplementedException.h"
@implementation OFMutexStillLockedException
+ newWithClass: (Class)class_
mutex: (OFMutex*)mutex
{
| > | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 |
* file.
*/
#include "config.h"
#import "OFMutexStillLockedException.h"
#import "OFString.h"
#import "OFThread.h"
#import "OFNotImplementedException.h"
@implementation OFMutexStillLockedException
+ newWithClass: (Class)class_
mutex: (OFMutex*)mutex
{
|
| ︙ | ︙ |
Modified src/exceptions/OFMutexUnlockFailedException.m from [3c59ab0517] to [fb91526d89].
| ︙ | ︙ | |||
14 15 16 17 18 19 20 21 22 23 24 25 26 27 |
* file.
*/
#include "config.h"
#import "OFMutexUnlockFailedException.h"
#import "OFString.h"
#import "OFNotImplementedException.h"
@implementation OFMutexUnlockFailedException
+ newWithClass: (Class)class_
mutex: (OFMutex*)mutex
{
| > | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 |
* file.
*/
#include "config.h"
#import "OFMutexUnlockFailedException.h"
#import "OFString.h"
#import "OFThread.h"
#import "OFNotImplementedException.h"
@implementation OFMutexUnlockFailedException
+ newWithClass: (Class)class_
mutex: (OFMutex*)mutex
{
|
| ︙ | ︙ |
Modified src/exceptions/OFNotConnectedException.m from [ba0d7f211d] to [2f7d4a9cb8].
| ︙ | ︙ | |||
14 15 16 17 18 19 20 21 22 23 24 25 26 27 |
* file.
*/
#include "config.h"
#import "OFNotConnectedException.h"
#import "OFString.h"
#import "OFNotImplementedException.h"
@implementation OFNotConnectedException
+ newWithClass: (Class)class_
socket: (OFStreamSocket*)socket
{
| > | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 |
* file.
*/
#include "config.h"
#import "OFNotConnectedException.h"
#import "OFString.h"
#import "OFTCPSocket.h"
#import "OFNotImplementedException.h"
@implementation OFNotConnectedException
+ newWithClass: (Class)class_
socket: (OFStreamSocket*)socket
{
|
| ︙ | ︙ |
Modified src/exceptions/OFRenameFileFailedException.m from [d24f625581] to [0319ec8956].
| ︙ | ︙ | |||
85 86 87 88 89 90 91 |
}
- (OFString*)sourcePath
{
return sourcePath;
}
| | | 85 86 87 88 89 90 91 92 93 94 95 96 |
}
- (OFString*)sourcePath
{
return sourcePath;
}
- (OFString*)destinationPath
{
return destinationPath;
}
@end
|
Modified src/exceptions/OFSeekFailedException.h from [f843c14a00] to [8fab00e250].
| ︙ | ︙ | |||
14 15 16 17 18 19 20 | * file. */ #ifndef _WIN32 # include <sys/types.h> #endif | < < | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 | * file. */ #ifndef _WIN32 # include <sys/types.h> #endif #import "OFException.h" @class OFSeekableStream; /** * \brief An exception indicating that seeking in a stream failed. */ |
| ︙ | ︙ |
Modified src/exceptions/OFSeekFailedException.m from [6ded05d92b] to [7b62503b45].
| ︙ | ︙ | |||
14 15 16 17 18 19 20 21 22 23 24 25 26 27 | * file. */ #include "config.h" #import "OFSeekFailedException.h" #import "OFString.h" #import "OFNotImplementedException.h" #import "common.h" @implementation OFSeekFailedException + newWithClass: (Class)class_ | > | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | * file. */ #include "config.h" #import "OFSeekFailedException.h" #import "OFString.h" #import "OFSeekableStream.h" #import "OFNotImplementedException.h" #import "common.h" @implementation OFSeekFailedException + newWithClass: (Class)class_ |
| ︙ | ︙ |
Modified src/exceptions/OFSetOptionFailedException.m from [dcdd902585] to [34a2e0a98f].
| ︙ | ︙ | |||
14 15 16 17 18 19 20 21 22 23 24 25 26 27 |
* file.
*/
#include "config.h"
#import "OFSetOptionFailedException.h"
#import "OFString.h"
#import "OFNotImplementedException.h"
@implementation OFSetOptionFailedException
+ newWithClass: (Class)class_
stream: (OFStream*)stream
{
| > | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 |
* file.
*/
#include "config.h"
#import "OFSetOptionFailedException.h"
#import "OFString.h"
#import "OFStream.h"
#import "OFNotImplementedException.h"
@implementation OFSetOptionFailedException
+ newWithClass: (Class)class_
stream: (OFStream*)stream
{
|
| ︙ | ︙ |
Modified src/exceptions/OFThreadJoinFailedException.m from [31a64b538f] to [cef37d7029].
| ︙ | ︙ | |||
14 15 16 17 18 19 20 21 22 23 24 25 26 27 |
* file.
*/
#include "config.h"
#import "OFThreadJoinFailedException.h"
#import "OFString.h"
#import "OFNotImplementedException.h"
@implementation OFThreadJoinFailedException
+ newWithClass: (Class)class_
thread: (OFThread*)thread
{
| > | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 |
* file.
*/
#include "config.h"
#import "OFThreadJoinFailedException.h"
#import "OFString.h"
#import "OFThread.h"
#import "OFNotImplementedException.h"
@implementation OFThreadJoinFailedException
+ newWithClass: (Class)class_
thread: (OFThread*)thread
{
|
| ︙ | ︙ |
Modified src/exceptions/OFThreadStartFailedException.m from [beb705e46b] to [187fa112b5].
| ︙ | ︙ | |||
14 15 16 17 18 19 20 21 22 23 24 25 26 27 |
* file.
*/
#include "config.h"
#import "OFThreadStartFailedException.h"
#import "OFString.h"
#import "OFNotImplementedException.h"
@implementation OFThreadStartFailedException
+ newWithClass: (Class)class_
thread: (OFThread*)thread
{
| > | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 |
* file.
*/
#include "config.h"
#import "OFThreadStartFailedException.h"
#import "OFString.h"
#import "OFThread.h"
#import "OFNotImplementedException.h"
@implementation OFThreadStartFailedException
+ newWithClass: (Class)class_
thread: (OFThread*)thread
{
|
| ︙ | ︙ |
Modified src/exceptions/OFThreadStillRunningException.m from [e27ddf16cb] to [b9155e70de].
| ︙ | ︙ | |||
14 15 16 17 18 19 20 21 22 23 24 25 26 27 |
* file.
*/
#include "config.h"
#import "OFThreadStillRunningException.h"
#import "OFString.h"
#import "OFNotImplementedException.h"
@implementation OFThreadStillRunningException
+ newWithClass: (Class)class_
thread: (OFThread*)thread
{
| > | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 |
* file.
*/
#include "config.h"
#import "OFThreadStillRunningException.h"
#import "OFString.h"
#import "OFThread.h"
#import "OFNotImplementedException.h"
@implementation OFThreadStillRunningException
+ newWithClass: (Class)class_
thread: (OFThread*)thread
{
|
| ︙ | ︙ |
Modified src/macros.h from [ab000dd8bb] to [0a4450faa7].
| ︙ | ︙ | |||
67 68 69 70 71 72 73 | #ifndef _WIN32 # define OF_PATH_DELIM '/' #else # define OF_PATH_DELIM '\\' #endif | | | 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 | #ifndef _WIN32 # define OF_PATH_DELIM '/' #else # define OF_PATH_DELIM '\\' #endif #define OF_IVAR_OFFSET(ivar) ((intptr_t)&ivar - (intptr_t)self) #define OF_GETTER(ivar, atomic) \ return objc_getProperty(self, _cmd, OF_IVAR_OFFSET(ivar), atomic); #define OF_SETTER(ivar, value, atomic, copy) \ objc_setProperty(self, _cmd, OF_IVAR_OFFSET(ivar), value, atomic, copy); static OF_INLINE uint16_t OF_CONST_FUNC of_bswap16_const(uint16_t i) |
| ︙ | ︙ | |||
178 179 180 181 182 183 184 | "bswap %%eax\n\t" "bswap %%edx\n\t" "xchgl %%eax, %%edx" : "=A"(i) : "0"(i) ); #else | | | | 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 | "bswap %%eax\n\t" "bswap %%edx\n\t" "xchgl %%eax, %%edx" : "=A"(i) : "0"(i) ); #else i = (uint64_t)of_bswap32_nonconst((uint32_t)(i & 0xFFFFFFFF)) << 32 | of_bswap32_nonconst((uint32_t)(i >> 32)); #endif return i; } #ifdef __GNUC__ # define of_bswap16(i) \ (__builtin_constant_p(i) ? of_bswap16_const(i) : of_bswap16_nonconst(i)) |
| ︙ | ︙ | |||
224 225 226 227 228 229 230 231 232 233 234 235 236 237 |
# define of_bswap64_if_be(i) (i)
# define of_bswap16_if_le(i) of_bswap16(i)
# define of_bswap32_if_le(i) of_bswap32(i)
# define of_bswap64_if_le(i) of_bswap64(i)
# define of_bswap32_vec_if_be(buf, len)
#endif
#define OF_ROL(val, bits) \
(((val) << ((bits) % (sizeof(val) * 8))) | \
(val) >> (sizeof(val) * 8 - ((bits) % (sizeof(val) * 8))))
#define OF_HASH_INIT(hash) hash = 0
#define OF_HASH_ADD(hash, byte) \
{ \
| > > > > > > > > | 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 |
# define of_bswap64_if_be(i) (i)
# define of_bswap16_if_le(i) of_bswap16(i)
# define of_bswap32_if_le(i) of_bswap32(i)
# define of_bswap64_if_le(i) of_bswap64(i)
# define of_bswap32_vec_if_be(buf, len)
#endif
/*
* We define it here and not in objfw-defs.h, as it would be theoretically
* possible to build a universal binary for Mac OS X and iOS.
*/
#if defined(__MACH__) && defined(__arm__)
# define OF_IOS
#endif
#define OF_ROL(val, bits) \
(((val) << ((bits) % (sizeof(val) * 8))) | \
(val) >> (sizeof(val) * 8 - ((bits) % (sizeof(val) * 8))))
#define OF_HASH_INIT(hash) hash = 0
#define OF_HASH_ADD(hash, byte) \
{ \
|
| ︙ | ︙ |
Modified src/objc_properties.m from [8ff7710d2c] to [5c790a53c4].
| ︙ | ︙ | |||
19 20 21 22 23 24 25 | #include <assert.h> #import "OFObject.h" #ifdef OF_THREADS # import "threading.h" # define NUM_SPINLOCKS 8 /* needs to be a power of 2 */ | | | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 |
#include <assert.h>
#import "OFObject.h"
#ifdef OF_THREADS
# import "threading.h"
# define NUM_SPINLOCKS 8 /* needs to be a power of 2 */
# define SPINLOCK_HASH(p) ((unsigned)((uintptr_t)p >> 4) & (NUM_SPINLOCKS - 1))
static of_spinlock_t spinlocks[NUM_SPINLOCKS];
#endif
BOOL
objc_properties_init()
{
#ifdef OF_THREADS
|
| ︙ | ︙ |
Modified src/objc_sync.m from [4107e88ea3] to [80e72847c9].
| ︙ | ︙ | |||
15 16 17 18 19 20 21 22 23 24 25 26 27 28 | */ #include "config.h" #include <stdio.h> #include <stdlib.h> #include <assert.h> #ifdef OF_OBJFW_RUNTIME # import <objfw-rt.h> #else # import <objc/objc.h> #endif | > > | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 | */ #include "config.h" #include <stdio.h> #include <stdlib.h> #include <assert.h> #include <sys/types.h> #ifdef OF_OBJFW_RUNTIME # import <objfw-rt.h> #else # import <objc/objc.h> #endif |
| ︙ | ︙ |
Modified src/of_asprintf.m from [983a2f4cc6] to [6a4139bc4d].
| ︙ | ︙ | |||
19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 |
#define _GNU_SOURCE
#include <stdlib.h>
#include <string.h>
#include <stdarg.h>
#include <stdbool.h>
#include <wchar.h>
#import "OFString.h"
#import "OFAutoreleasePool.h"
#import "asprintf.h"
#define MAX_SUBFMT_LEN 64
struct context {
const char *fmt;
size_t fmt_len;
char subfmt[MAX_SUBFMT_LEN + 1];
| > > > > | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 |
#define _GNU_SOURCE
#include <stdlib.h>
#include <string.h>
#include <stdarg.h>
#include <stdbool.h>
#include <wchar.h>
#include <sys/types.h>
#import "OFString.h"
#import "OFAutoreleasePool.h"
#import "asprintf.h"
#import "macros.h"
#define MAX_SUBFMT_LEN 64
struct context {
const char *fmt;
size_t fmt_len;
char subfmt[MAX_SUBFMT_LEN + 1];
|
| ︙ | ︙ | |||
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 191 192 193 194 |
ctx->len_mod = LENGTH_MODIFIER_H;
}
break;
case 'l': /* and also ll */
if (ctx->fmt_len > ctx->i + 1 && ctx->fmt[ctx->i + 1] == 'l') {
if (!append_subfmt(ctx, ctx->fmt + ctx->i, 2))
return false;
ctx->i++;
ctx->len_mod = LENGTH_MODIFIER_LL;
} else {
if (!append_subfmt(ctx, ctx->fmt + ctx->i, 1))
return false;
ctx->len_mod = LENGTH_MODIFIER_L;
}
break;
case 'j':
if (!append_subfmt(ctx, ctx->fmt + ctx->i, 1))
return false;
ctx->len_mod = LENGTH_MODIFIER_J;
break;
case 'z':
if (!append_subfmt(ctx, ctx->fmt + ctx->i, 1))
return false;
| > > > > > > > > > > | 169 170 171 172 173 174 175 176 177 178 179 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 |
ctx->len_mod = LENGTH_MODIFIER_H;
}
break;
case 'l': /* and also ll */
if (ctx->fmt_len > ctx->i + 1 && ctx->fmt[ctx->i + 1] == 'l') {
#ifndef _WIN32
if (!append_subfmt(ctx, ctx->fmt + ctx->i, 2))
return false;
#else
if (!append_subfmt(ctx, "I64", 3))
return false;
#endif
ctx->i++;
ctx->len_mod = LENGTH_MODIFIER_LL;
} else {
if (!append_subfmt(ctx, ctx->fmt + ctx->i, 1))
return false;
ctx->len_mod = LENGTH_MODIFIER_L;
}
break;
case 'j':
#ifndef _WIN32
if (!append_subfmt(ctx, ctx->fmt + ctx->i, 1))
return false;
#else
if (!append_subfmt(ctx, "I64", 3))
return false;
#endif
ctx->len_mod = LENGTH_MODIFIER_J;
break;
case 'z':
if (!append_subfmt(ctx, ctx->fmt + ctx->i, 1))
return false;
|
| ︙ | ︙ | |||
206 207 208 209 210 211 212 213 214 215 216 217 218 219 | case 'L': if (!append_subfmt(ctx, ctx->fmt + ctx->i, 1)) return false; ctx->len_mod = LENGTH_MODIFIER_CAPITAL_L; break; default: ctx->i--; break; } ctx->state = STATE_FORMAT_CONVERSION_SPECIFIER; | > > > > > > > > > > > > > > > > > > > > > > > | 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 |
case 'L':
if (!append_subfmt(ctx, ctx->fmt + ctx->i, 1))
return false;
ctx->len_mod = LENGTH_MODIFIER_CAPITAL_L;
break;
#ifdef _WIN32
case 'I': /* win32 strangeness (I64 instead of ll or j) */
if (ctx->fmt_len > ctx->i + 2 && ctx->fmt[ctx->i + 1] == '6' &&
ctx->fmt[ctx->i + 2] == '4') {
if (!append_subfmt(ctx, ctx->fmt + ctx->i, 3))
return false;
ctx->i += 2;
ctx->len_mod = LENGTH_MODIFIER_LL;
} else
ctx->i--;
break;
#endif
#ifdef OF_IOS
case 'q': /* iOS uses this for PRI?64 */
if (!append_subfmt(ctx, ctx->fmt + ctx->i, 1))
return false;
ctx->len_mod = LENGTH_MODIFIER_LL;
break;
#endif
default:
ctx->i--;
break;
}
ctx->state = STATE_FORMAT_CONVERSION_SPECIFIER;
|
| ︙ | ︙ |
Modified src/threading.h from [ad9f8119e0] to [ed61fa08de].
| ︙ | ︙ | |||
86 87 88 89 90 91 92 93 94 95 96 97 98 99 |
return NO;
CloseHandle(thread);
return YES;
#endif
}
static OF_INLINE void
of_thread_exit()
{
#if defined(OF_HAVE_PTHREADS)
pthread_exit(NULL);
#elif defined(_WIN32)
| > > > > > > > > > > > | 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 |
return NO;
CloseHandle(thread);
return YES;
#endif
}
static OF_INLINE BOOL
of_thread_detach(of_thread_t thread)
{
#if defined(OF_HAVE_PTHREADS)
return !pthread_detach(thread);
#elif defined(_WIN32)
/* FIXME */
return YES;
#endif
}
static OF_INLINE void
of_thread_exit()
{
#if defined(OF_HAVE_PTHREADS)
pthread_exit(NULL);
#elif defined(_WIN32)
|
| ︙ | ︙ |
Modified tests/OFBlockTests.m from [202f1a62ea] to [0518f13692].
| ︙ | ︙ | |||
18 19 20 21 22 23 24 | #import "OFBlock.h" #import "OFString.h" #import "OFAutoreleasePool.h" #if defined(OF_OBJFW_RUNTIME) # include <objfw-rt.h> | | | | | | 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 | #import "OFBlock.h" #import "OFString.h" #import "OFAutoreleasePool.h" #if defined(OF_OBJFW_RUNTIME) # include <objfw-rt.h> #elif defined(OF_APPLE_RUNTIME) || defined(OF_GNU_RUNTIME) # include <objc/runtime.h> #elif defined(OF_OLD_GNU_RUNTIME) # include <objc/objc-api.h> #endif #if defined(OF_OLD_GNU_RUNTIME) || defined(OF_OBJFW_RUNTIME) # define objc_getClass objc_get_class #endif #import "TestsAppDelegate.h" |
| ︙ | ︙ | |||
57 58 59 60 61 62 63 |
(Class)&_NSConcreteGlobalBlock == objc_getClass("OFGlobalBlock") &&
[g isKindOfClass: [OFBlock class]])
TEST(@"Class of a malloc block",
(Class)&_NSConcreteMallocBlock == objc_getClass("OFMallocBlock"))
TEST(@"Copying a stack block",
| > | | | 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 |
(Class)&_NSConcreteGlobalBlock == objc_getClass("OFGlobalBlock") &&
[g isKindOfClass: [OFBlock class]])
TEST(@"Class of a malloc block",
(Class)&_NSConcreteMallocBlock == objc_getClass("OFMallocBlock"))
TEST(@"Copying a stack block",
(m = [[s copy] autorelease]) &&
[m class] == objc_getClass("OFMallocBlock") &&
[m isKindOfClass: [OFBlock class]])
TEST(@"Copying a global block", (id)g == [[g copy] autorelease])
TEST(@"Copying a malloc block",
(id)m == [m copy] && [m retainCount] == 2)
TEST(@"Autorelease a stack block", R([s autorelease]))
TEST(@"Autorelease a global block", R([g autorelease]))
TEST(@"Autorelease a malloc block", R([m autorelease]))
[pool drain];
}
@end
|
Modified tests/OFStringTests.m from [f41872f1e2] to [d0b2683202].
| ︙ | ︙ | |||
133 134 135 136 137 138 139 | TEST(@"+[stringWithContentsOfURL:encoding]", (s[1] = [OFString stringWithContentsOfURL: [OFURL URLWithString: @"file://testfile.txt"] encoding: OF_STRING_ENCODING_ISO_8859_1]) && [s[1] isEqual: @"testäöü"]) TEST(@"-[appendCStringWithLength:]", | | | | 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 | TEST(@"+[stringWithContentsOfURL:encoding]", (s[1] = [OFString stringWithContentsOfURL: [OFURL URLWithString: @"file://testfile.txt"] encoding: OF_STRING_ENCODING_ISO_8859_1]) && [s[1] isEqual: @"testäöü"]) TEST(@"-[appendCStringWithLength:]", R([s[0] appendCString: "foo\xEF\xBB\xBF" "barqux" + 3 withLength: 6]) && [s[0] isEqual: @"foobar"]) EXPECT_EXCEPTION(@"Detection of invalid UTF-8 encoding #1", OFInvalidEncodingException, [OFString stringWithCString: "\xE0\x80"]) EXPECT_EXCEPTION(@"Detection of invalid UTF-8 encoding #2", OFInvalidEncodingException, [OFString stringWithCString: "\xF0\x80\x80\xC0"]) |
| ︙ | ︙ | |||
400 401 402 403 404 405 406 |
withString: @""]) &&
[s[0] isEqual: @""])
EXPECT_EXCEPTION(@"Detect OoR in "
@"-[deleteCharactersFromIndex:toIndex:] #1", OFOutOfRangeException,
{
s[0] = [OFMutableString stringWithString: @"𝄞öö"];
| | | | | | | > > > > > > > > > > > > > > > > > > > | 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 |
withString: @""]) &&
[s[0] isEqual: @""])
EXPECT_EXCEPTION(@"Detect OoR in "
@"-[deleteCharactersFromIndex:toIndex:] #1", OFOutOfRangeException,
{
s[0] = [OFMutableString stringWithString: @"𝄞öö"];
[s[0] deleteCharactersFromIndex: 2
toIndex: 4];
})
EXPECT_EXCEPTION(@"Detect OoR in "
@"-[deleteCharactersFromIndex:toIndex:] #2", OFOutOfRangeException,
[s[0] deleteCharactersFromIndex: 4
toIndex: 4])
EXPECT_EXCEPTION(@"Detect s > e in "
@"-[deleteCharactersFromIndex:toIndex:]",
OFInvalidArgumentException,
[s[0] deleteCharactersFromIndex: 2
toIndex: 0])
EXPECT_EXCEPTION(@"OoR "
@"-[replaceCharactersFromIndex:toIndex:withString:] #1",
OFOutOfRangeException, [s[0] replaceCharactersFromIndex: 2
toIndex: 4
withString: @""])
EXPECT_EXCEPTION(@"OoR "
@"-[replaceCharactersFromIndex:toIndex:withString:] #2",
OFOutOfRangeException,
[s[0] replaceCharactersFromIndex: 4
toIndex: 4
withString: @""])
EXPECT_EXCEPTION(@"s>e in "
@"-[replaceCharactersFromIndex:toIndex:withString:]",
OFInvalidArgumentException, [s[0] replaceCharactersFromIndex: 2
toIndex: 0
withString: @""])
TEST(@"-[replaceOccurrencesOfString:withString:]",
(s[0] = [OFMutableString stringWithString:
@"asd fo asd fofo asd"]) &&
R([s[0] replaceOccurrencesOfString: @"fo"
withString: @"foo"]) &&
[s[0] isEqual: @"asd foo asd foofoo asd"] &&
|
| ︙ | ︙ |
Modified tests/OFURLTests.m from [030d169ca8] to [8b94bb792f].
| ︙ | ︙ | |||
71 72 73 74 75 76 77 | [[u1 parameters] isEqual: @"p"] && [u4 parameters] == nil) TEST(@"-[query]", [[u1 query] isEqual: @"q"] && [u4 query] == nil) TEST(@"-[fragment]", [[u1 fragment] isEqual: @"f"] && [u4 fragment] == nil) TEST(@"-[copy]", R(u4 = [[u1 copy] autorelease])) | | > | 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 | [[u1 parameters] isEqual: @"p"] && [u4 parameters] == nil) TEST(@"-[query]", [[u1 query] isEqual: @"q"] && [u4 query] == nil) TEST(@"-[fragment]", [[u1 fragment] isEqual: @"f"] && [u4 fragment] == nil) TEST(@"-[copy]", R(u4 = [[u1 copy] autorelease])) TEST(@"-[isEqual:]", [u1 isEqual: u4] && ![u2 isEqual: u3] && [[OFURL URLWithString: @"http://bar/"] isEqual: u3]) TEST(@"-[hash:]", [u1 hash] == [u4 hash] && [u2 hash] != [u3 hash]) EXPECT_EXCEPTION(@"Detection of invalid format", OFInvalidFormatException, [OFURL URLWithString: @"http"]) EXPECT_EXCEPTION(@"Detection of invalid scheme", OFInvalidFormatException, [OFURL URLWithString: @"foo://"]) [pool drain]; } @end |
Modified tests/OFXMLElementTests.m from [1e31b5bb2b] to [9cc1013df2].
| ︙ | ︙ | |||
115 116 117 118 119 120 121 | R([elem[2] addChild: [OFXMLElement elementWithName: @"bar" namespace: @"urn:objfw:test"]]) && [[elem[2] XMLString] isEqual: @"<objfw-test:foo test='test'><objfw-test:bar/></objfw-test:foo>"]) TEST(@"+[elementWithXMLString:] and -[stringValue]", [[[OFXMLElement elementWithXMLString: | > | > > > > > > | 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 | R([elem[2] addChild: [OFXMLElement elementWithName: @"bar" namespace: @"urn:objfw:test"]]) && [[elem[2] XMLString] isEqual: @"<objfw-test:foo test='test'><objfw-test:bar/></objfw-test:foo>"]) TEST(@"+[elementWithXMLString:] and -[stringValue]", [[[OFXMLElement elementWithXMLString: @"<?xml version='1.0' encoding='UTF-8'?>\r\n<x>foo<![CDATA[bar]]>" @"<y>b<!-- fooo -->az</y>qux</x>"] stringValue] isEqual: @"foobarbazqux"]) TEST(@"-[elementsForName:namespace:]", (a = [elem[2] elementsForName: @"bar" namespace: @"urn:objfw:test"]) && [a count] == 1 && [[[a firstObject] XMLString] isEqual: @"<bar xmlns='urn:objfw:test'/>"]) TEST(@"-[isEqual:]", [[OFXMLElement elementWithXMLString: @"<foo bar='asd'/>"] isEqual: [OFXMLElement elementWithXMLString: @"<foo bar='asd'></foo>"]] && [[OFXMLElement elementWithXMLString: @"<x><y/></x>"] isEqual: [OFXMLElement elementWithXMLString: @"<x><y></y></x>"]]) [pool drain]; } @end |
Modified tests/OFXMLParserTests.m from [1ef5f83edf] to [1a865f21e8].
| ︙ | ︙ | |||
372 373 374 375 376 377 378 379 380 381 | EXPECT_EXCEPTION(@"Detection of junk after the document #1", OFMalformedXMLException, [parser parseString: @"a"]) EXPECT_EXCEPTION(@"Detection of junk after the document #2", OFMalformedXMLException, [parser parseString: @"<!["]) [pool drain]; } @end | > > > > > > > > > > > > > > > | 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 | EXPECT_EXCEPTION(@"Detection of junk after the document #1", OFMalformedXMLException, [parser parseString: @"a"]) EXPECT_EXCEPTION(@"Detection of junk after the document #2", OFMalformedXMLException, [parser parseString: @"<!["]) parser = [OFXMLParser parser]; EXPECT_EXCEPTION(@"Detection of invalid XML processing instructions #1", OFMalformedXMLException, [parser parseString: @"<?xml version='2.0'?>"]) parser = [OFXMLParser parser]; EXPECT_EXCEPTION(@"Detection of invalid XML processing instructions #2", OFMalformedXMLException, [parser parseString: @"<?xml encoding='UTF-7'?>"]) parser = [OFXMLParser parser]; EXPECT_EXCEPTION(@"Detection of invalid XML processing instructions #3", OFMalformedXMLException, [parser parseString: @"<x><?xml?></x>"]) [pool drain]; } @end |
Modified tests/TestsAppDelegate.h from [04f3a2b803] to [75ac14eddf].
| ︙ | ︙ | |||
38 39 40 41 42 43 44 |
[self outputTesting: test \
inModule: module]; \
\
@try { \
code; \
} @catch (exception *e) { \
caught = YES; \
| | | 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 |
[self outputTesting: test \
inModule: module]; \
\
@try { \
code; \
} @catch (exception *e) { \
caught = YES; \
[e release]; \
} \
\
if (caught) \
[self outputSuccess: test \
inModule: module]; \
else { \
[self outputFailure: test \
|
| ︙ | ︙ |
Modified utils/objfw-compile from [737a77c336] to [b75d583b48].
| ︙ | ︙ | |||
107 108 109 110 111 112 113 114 115 116 117 118 119 120 | -D*) CPPFLAGS="$CPPFLAGS $1" ;; -framework) shift LIBS="$LIBS -framework $1" ;; -g*) OBJCFLAGS="$OBJCFLAGS $1" ;; -I) shift CPPFLAGS="$CPPFLAGS -I$1" ;; | > > > | 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 | -D*) CPPFLAGS="$CPPFLAGS $1" ;; -framework) shift LIBS="$LIBS -framework $1" ;; -f*) OBJCFLAGS="$OBJCFLAGS $1" ;; -g*) OBJCFLAGS="$OBJCFLAGS $1" ;; -I) shift CPPFLAGS="$CPPFLAGS -I$1" ;; |
| ︙ | ︙ |
Modified utils/objfw-config.in from [a79a727b4f] to [4a88c90054].
| ︙ | ︙ | |||
33 34 35 36 37 38 39 |
LDFLAGS_REEXPORT="@LDFLAGS_REEXPORT@"
LDFLAGS_RPATH="@LDFLAGS_RPATH@"
LIBS="-L${libdir} -lobjfw @LIBS@"
PLUGIN_CFLAGS="@PLUGIN_CFLAGS@"
PLUGIN_LDFLAGS="@PLUGIN_LDFLAGS@"
PLUGIN_SUFFIX="@PLUGIN_SUFFIX@"
PROG_SUFFIX="@EXEEXT@"
| | | 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 |
LDFLAGS_REEXPORT="@LDFLAGS_REEXPORT@"
LDFLAGS_RPATH="@LDFLAGS_RPATH@"
LIBS="-L${libdir} -lobjfw @LIBS@"
PLUGIN_CFLAGS="@PLUGIN_CFLAGS@"
PLUGIN_LDFLAGS="@PLUGIN_LDFLAGS@"
PLUGIN_SUFFIX="@PLUGIN_SUFFIX@"
PROG_SUFFIX="@EXEEXT@"
VERSION="0.5.4"
show_help() {
cat <<__EOF__
objfw-config: Available arguments are:
--all Outputs all flags + libs
--cflags Outputs the required CFLAGS
|
| ︙ | ︙ |