Skip to content

Revert "[gardening] Fix typo: "nul-terminated" → "null-terminated"" #1301

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

Merged
merged 1 commit into from
Feb 13, 2016
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 include/swift/AST/Identifier.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ enum class DeclRefKind {
};

/// Identifier - This is an instance of a uniqued identifier created by
/// ASTContext. It just wraps a null-terminated "const char*".
/// ASTContext. It just wraps a nul-terminated "const char*".
class Identifier {
friend class ASTContext;
const char *Pointer;
Expand Down
2 changes: 1 addition & 1 deletion include/swift/Parse/Lexer.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class Lexer {

/// Pointer to one past the end character of the buffer, even in a lexer
/// that scans a subrange of the buffer. Because the buffer is always
/// NULL-terminated, this points to the NUL terminator.
/// NUL-terminated, this points to the NUL terminator.
const char *BufferEnd;

/// Pointer to the artificial EOF that is located before BufferEnd. Useful
Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/SDK/Foundation/NSStringAPI.swift
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ extension String {
/// `encoding`, without any allocations. Does not NULL-terminate.
///
/// - Parameter buffer: A buffer into which to store the bytes from
/// the receiver. The returned bytes are not NULL-terminated.
/// the receiver. The returned bytes are not NUL-terminated.
///
/// - Parameter maxBufferCount: The maximum number of bytes to write
/// to buffer.
Expand Down
4 changes: 2 additions & 2 deletions stdlib/public/core/CString.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import SwiftShims

extension String {
/// Creates a new `String` by copying the null-terminated UTF-8 data
/// Creates a new `String` by copying the nul-terminated UTF-8 data
/// referenced by a `CString`.
///
/// Returns `nil` if the `CString` is `NULL` or if it contains ill-formed
Expand All @@ -30,7 +30,7 @@ extension String {
input: UnsafeBufferPointer(start: UnsafeMutablePointer(cs), count: len))
}

/// Creates a new `String` by copying the null-terminated UTF-8 data
/// Creates a new `String` by copying the nul-terminated UTF-8 data
/// referenced by a `CString`.
///
/// Returns `nil` if the `CString` is `NULL`. If `CString` contains
Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/core/LifetimeManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public func withExtendedLifetime<T, Result>(
extension String {

/// Invoke `f` on the contents of this string, represented as
/// a null-terminated array of char, ensuring that the array's
/// a nul-terminated array of char, ensuring that the array's
/// lifetime extends through the execution of `f`.
public func withCString<Result>(
@noescape f: UnsafePointer<Int8> throws -> Result
Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/core/StringUTF8.swift
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ extension String {
return _core.elementWidth == 1 ? _core.startASCII : nil
}

/// A contiguously-stored null-terminated UTF-8 representation of
/// A contiguously-stored nul-terminated UTF-8 representation of
/// `self`.
///
/// To access the underlying memory, invoke
Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/runtime/Reflection.mm
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ explicit String(const char *ptr)
: String(ptr, strlen(ptr))
{}

/// Create a Swift String from two concatenated null-terminated strings.
/// Create a Swift String from two concatenated nul-terminated strings.
explicit String(const char *ptr1, const char *ptr2) {
size_t len1 = strlen(ptr1);
size_t len2 = strlen(ptr2);
Expand Down