From 3d1d6f8837b71a62a91376e394f529e8749fd184 Mon Sep 17 00:00:00 2001 From: deraadt <> Date: Tue, 24 Jan 2017 10:57:48 +0000 Subject: string terminator is called a NUL --- src/usr.sbin/ocspcheck/http.c | 6 +++--- src/usr.sbin/ocspcheck/http.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/usr.sbin/ocspcheck/http.c b/src/usr.sbin/ocspcheck/http.c index c5577791d9..df76a04e60 100644 --- a/src/usr.sbin/ocspcheck/http.c +++ b/src/usr.sbin/ocspcheck/http.c @@ -1,4 +1,4 @@ -/* $Id: http.c,v 1.4 2017/01/24 10:33:16 deraadt Exp $ */ +/* $Id: http.c,v 1.5 2017/01/24 10:57:48 deraadt Exp $ */ /* * Copyright (c) 2016 Kristaps Dzonsons * @@ -527,7 +527,7 @@ http_head_parse(const struct http *http, struct httpxfer *trans, size_t *sz) /* * Allocate headers, then step through the data buffer, parsing * out headers as we have them. - * We know at this point that the buffer is nil-terminated in + * We know at this point that the buffer is NUL-terminated in * the usual way. */ @@ -638,7 +638,7 @@ http_head_read(const struct http *http, struct httpxfer *trans, size_t *sz) * The header data is invalid if it has any binary characters in * it: check that now. * This is important because we want to guarantee that all - * header keys and pairs are properly nil-terminated. + * header keys and pairs are properly NUL-terminated. */ if (strlen(trans->hbuf) != (uintptr_t)(ep - trans->hbuf)) { diff --git a/src/usr.sbin/ocspcheck/http.h b/src/usr.sbin/ocspcheck/http.h index b4e66f21d3..6d19771f56 100644 --- a/src/usr.sbin/ocspcheck/http.h +++ b/src/usr.sbin/ocspcheck/http.h @@ -1,4 +1,4 @@ -/* $Id: http.h,v 1.1 2017/01/24 08:50:57 beck Exp $ */ +/* $Id: http.h,v 1.2 2017/01/24 10:57:48 deraadt Exp $ */ /* * Copyright (c) 2016 Kristaps Dzonsons * @@ -36,7 +36,7 @@ typedef ssize_t (*readfp)(char *, size_t, const struct http *); /* * HTTP/S header pair. * There's also a cooked-up pair, "Status", with the status code. - * Both strings are nil-terminated. + * Both strings are NUL-terminated. */ struct httphead { const char *key; -- cgit v1.2.3-55-g6feb