summaryrefslogtreecommitdiff
path: root/pkt-line.h
diff options
context:
space:
mode:
authorJustin Lebar <jlebar@google.com>2014-03-31 15:11:46 -0700
committerJunio C Hamano <gitster@pobox.com>2014-03-31 15:29:27 -0700
commit01689909eb9f8366583c44b325d8d9ba259a2538 (patch)
tree6a4635a267885b3429f55c81a9a1c8787e36802e /pkt-line.h
parente34b272344c1e7eb640dcce5990a75460240daed (diff)
downloadgit-01689909eb9f8366583c44b325d8d9ba259a2538.tar.gz
comments: fix misuses of "nor"
Signed-off-by: Justin Lebar <jlebar@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pkt-line.h')
-rw-r--r--pkt-line.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkt-line.h b/pkt-line.h
index 0a838d1656..3cb9d91baa 100644
--- a/pkt-line.h
+++ b/pkt-line.h
@@ -28,10 +28,10 @@ void packet_buf_write(struct strbuf *buf, const char *fmt, ...) __attribute__((f
* Read a packetized line into the buffer, which must be at least size bytes
* long. The return value specifies the number of bytes read into the buffer.
*
- * If src_buffer is not NULL (and nor is *src_buffer), it should point to a
- * buffer containing the packet data to parse, of at least *src_len bytes.
- * After the function returns, src_buf will be incremented and src_len
- * decremented by the number of bytes consumed.
+ * If src_buffer and *src_buffer are not NULL, it should point to a buffer
+ * containing the packet data to parse, of at least *src_len bytes. After the
+ * function returns, src_buf will be incremented and src_len decremented by the
+ * number of bytes consumed.
*
* If src_buffer (or *src_buffer) is NULL, then data is read from the
* descriptor "fd".