From b711909d8f0809dd63ccbe2218925cbae14283d4 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Sun, 23 Mar 2003 02:06:20 -0800 Subject: [PATCH] remove NUL v NULL confusion --- arch/i386/lib/usercopy.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/i386/lib/usercopy.c b/arch/i386/lib/usercopy.c index e3a66ce558a9..452e53c2c91d 100644 --- a/arch/i386/lib/usercopy.c +++ b/arch/i386/lib/usercopy.c @@ -51,18 +51,18 @@ do { \ } while (0) /** - * __strncpy_from_user: - Copy a NULL terminated string from userspace, with less checking. + * __strncpy_from_user: - Copy a NUL terminated string from userspace, with less checking. * @dst: Destination address, in kernel space. This buffer must be at * least @count bytes long. * @src: Source address, in user space. - * @count: Maximum number of bytes to copy, including the trailing NULL. + * @count: Maximum number of bytes to copy, including the trailing NUL. * - * Copies a NULL-terminated string from userspace to kernel space. + * Copies a NUL-terminated string from userspace to kernel space. * Caller must check the specified block with access_ok() before calling * this function. * * On success, returns the length of the string (not including the trailing - * NULL). + * NUL). * * If access to userspace fails, returns -EFAULT (some data may have been * copied). @@ -79,16 +79,16 @@ __strncpy_from_user(char *dst, const char *src, long count) } /** - * strncpy_from_user: - Copy a NULL terminated string from userspace. + * strncpy_from_user: - Copy a NUL terminated string from userspace. * @dst: Destination address, in kernel space. This buffer must be at * least @count bytes long. * @src: Source address, in user space. - * @count: Maximum number of bytes to copy, including the trailing NULL. + * @count: Maximum number of bytes to copy, including the trailing NUL. * - * Copies a NULL-terminated string from userspace to kernel space. + * Copies a NUL-terminated string from userspace to kernel space. * * On success, returns the length of the string (not including the trailing - * NULL). + * NUL). * * If access to userspace fails, returns -EFAULT (some data may have been * copied). @@ -172,9 +172,9 @@ __clear_user(void *to, unsigned long n) * @s: The string to measure. * @n: The maximum valid length * - * Get the size of a NULL-terminated string in user space. + * Get the size of a NUL-terminated string in user space. * - * Returns the size of the string INCLUDING the terminating NULL. + * Returns the size of the string INCLUDING the terminating NUL. * On exception, returns 0. * If the string is too long, returns a value greater than @n. */ -- cgit v1.2.3