diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-07-22 10:26:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-22 10:26:52 -0700 |
| commit | 0196a605f742580f53250bddf82b355a1018d9be (patch) | |
| tree | ad04c821e277f94a94d12f827a8f88b0e1146bb2 | |
| parent | 054e22caf4962d6079b9aa1c5add69b02124db9d (diff) | |
| parent | 97ea0d1043715f8fa2ee4a833195519c0be4e046 (diff) | |
| download | git-0196a605f742580f53250bddf82b355a1018d9be.tar.gz git-0196a605f742580f53250bddf82b355a1018d9be.tar.xz | |
Merge branch 'jm/api-strbuf-doc' into maint
* jm/api-strbuf-doc:
api-strbuf.txt minor typos
| -rw-r--r-- | Documentation/technical/api-strbuf.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/technical/api-strbuf.txt b/Documentation/technical/api-strbuf.txt index 3350d97dd..1d00e4d59 100644 --- a/Documentation/technical/api-strbuf.txt +++ b/Documentation/technical/api-strbuf.txt @@ -7,10 +7,10 @@ use the mem* functions than a str* one (memchr vs. strchr e.g.). Though, one has to be careful about the fact that str* functions often stop on NULs and that strbufs may have embedded NULs. -An strbuf is NUL terminated for convenience, but no function in the +A strbuf is NUL terminated for convenience, but no function in the strbuf API actually relies on the string being free of NULs. -strbufs has some invariants that are very important to keep in mind: +strbufs have some invariants that are very important to keep in mind: . The `buf` member is never NULL, so it can be used in any usual C string operations safely. strbuf's _have_ to be initialized either by @@ -56,8 +56,8 @@ Data structures * `struct strbuf` This is the string buffer structure. The `len` member can be used to -determine the current length of the string, and `buf` member provides access to -the string itself. +determine the current length of the string, and `buf` member provides +access to the string itself. Functions --------- @@ -184,7 +184,7 @@ strbuf_addstr(sb, "immediate string"); `strbuf_addbuf`:: - Copy the contents of an other buffer at the end of the current one. + Copy the contents of another buffer at the end of the current one. `strbuf_adddup`:: |