@@ -39,12 +39,12 @@ uint32_t _diskNumber, _centralDirectoryDisk; uint64_t _centralDirectoryEntriesInDisk, _centralDirectoryEntries; uint64_t _centralDirectorySize; int64_t _centralDirectoryOffset; OFString *_archiveComment; - OFMutableArray OF_GENERIC(OFZIPArchiveEntry*) *_entries; - OFMutableDictionary OF_GENERIC(OFString*, OFZIPArchiveEntry*) + OFMutableArray OF_GENERIC(OFZIPArchiveEntry *) *_entries; + OFMutableDictionary OF_GENERIC(OFString *, OFZIPArchiveEntry *) *_pathToEntryMap; OFStream *_lastReturnedStream; } /*! @@ -56,40 +56,40 @@ * @brief Creates a new OFZIPArchive object with the specified seekable stream. * * @param stream A seekable stream from which the ZIP archive will be read * @return A new, autoreleased OFZIPArchive */ -+ (instancetype)archiveWithSeekableStream: (OFSeekableStream*)stream; ++ (instancetype)archiveWithSeekableStream: (OFSeekableStream *)stream; #ifdef OF_HAVE_FILES /*! * @brief Creates a new OFZIPArchive object with the specified file. * * @param path The path to the ZIP file * @return A new, autoreleased OFZIPArchive */ -+ (instancetype)archiveWithPath: (OFString*)path; ++ (instancetype)archiveWithPath: (OFString *)path; #endif /*! * @brief Initializes an already allocated OFZIPArchive object with the * specified seekable stream. * * @param stream A seekable stream from which the ZIP archive will be read * @return An initialized OFZIPArchive */ -- initWithSeekableStream: (OFSeekableStream*)stream; +- initWithSeekableStream: (OFSeekableStream *)stream; #ifdef OF_HAVE_FILES /*! * @brief Initializes an already allocated OFZIPArchive object with the * specified file. * * @param path The path to the ZIP file * @return An initialized OFZIPArchive */ -- initWithPath: (OFString*)path; +- initWithPath: (OFString *)path; #endif /*! * @brief Returns the entries of the central directory of the archive as an * array of objects of class @ref OFZIPArchiveEntry. @@ -98,11 +98,11 @@ * directory, which does not need to be the order in which the actual files are * stored. * * @return The entries of the central directory of the archive as an array */ -- (OFArray OF_GENERIC(OFZIPArchiveEntry*)*)entries; +- (OFArray OF_GENERIC(OFZIPArchiveEntry *) *)entries; /*! * @brief Returns a stream for reading the specified file from the archive. * * @warning Calling @ref streamForReadingFile: will invalidate all streams @@ -110,9 +110,9 @@ * invalidated stream will throw an @ref OFReadFailedException! * * @param path The path to the file inside the archive * @return A stream for reading the specified file form the archive */ -- (OFStream*)streamForReadingFile: (OFString*)path; +- (OFStream *)streamForReadingFile: (OFString *)path; @end OF_ASSUME_NONNULL_END