Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Declared some extra nullability to please Xcode 7 beta. #500

Merged
merged 3 commits into from
Aug 7, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ObjectiveGit/GTConfiguration+Private.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
/// repository - The repository in which the config resides. May be nil.
///
/// Returns the initialized object.
- (nullable instancetype)initWithGitConfig:(git_config *)config repository:(nullable GTRepository *)repository NS_DESIGNATED_INITIALIZER;
- (nullable instancetype)initWithGitConfig:(nonnull git_config *)config repository:(nullable GTRepository *)repository NS_DESIGNATED_INITIALIZER;

@end
2 changes: 1 addition & 1 deletion ObjectiveGit/GTDiff+Private.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
/// provides a pointer to that structure to the given `block`.
///
/// Returns the result of invoking `block`.
+ (int)handleParsedOptionsDictionary:(nullable NSDictionary *)dictionary usingBlock:(int (^)(git_diff_options *optionsStruct))block;
+ (int)handleParsedOptionsDictionary:(nullable NSDictionary *)dictionary usingBlock:(nonnull int (^)(git_diff_options * __null_unspecified optionsStruct))block;

@end
4 changes: 2 additions & 2 deletions ObjectiveGit/GTFilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ extern const NSInteger GTFilterErrorNameAlreadyRegistered;

/// The check block. Determines whether the `applyBlock` should be run for given
/// source.
@property (nonatomic, copy) BOOL (^checkBlock)(void **payload, GTFilterSource *source, const char **attr_values);
@property (nonatomic, copy) BOOL (^checkBlock)(void * __null_unspecified * __null_unspecified payload, GTFilterSource *source, const char * __null_unspecified * __null_unspecified attr_values);

/// The cleanup block. Called after the `applyBlock` to given the filter a
/// chance to clean up the `payload`.
Expand All @@ -49,7 +49,7 @@ extern const NSInteger GTFilterErrorNameAlreadyRegistered;
/// applyBlock - The block to use to apply the filter. Cannot be nil.
///
/// Returns the initialized object.
- (nullable instancetype)initWithName:(NSString *)name attributes:(nullable NSString *)attributes applyBlock:(NSData * (^)(void **payload, NSData *from, GTFilterSource *source, BOOL *applied))applyBlock NS_DESIGNATED_INITIALIZER;
- (nullable instancetype)initWithName:(NSString *)name attributes:(nullable NSString *)attributes applyBlock:(NSData * (^)(void *__null_unspecified * __null_unspecified payload, NSData *from, GTFilterSource *source, BOOL *applied))applyBlock NS_DESIGNATED_INITIALIZER;

/// Look up a filter based on its name.
///
Expand Down
4 changes: 2 additions & 2 deletions ObjectiveGit/GTReflog+Private.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@

@interface GTReflog ()

- (instancetype)init NS_UNAVAILABLE;
- (nullable instancetype)init NS_UNAVAILABLE;

/// Initializes the receiver with a reference. Designated initializer.
///
/// reference - The reference whose reflog is being represented. Cannot be nil.
///
/// Returns the initialized object.
- (nullable instancetype)initWithReference:(GTReference *)reference NS_DESIGNATED_INITIALIZER;
- (nullable instancetype)initWithReference:(nonnull GTReference *)reference NS_DESIGNATED_INITIALIZER;

@end