This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / lib / string.c

diff --git a/lib/string.c b/lib/string.c
index d2f23f2..d4dbd2c 100644 (file)
--- a/lib/string.c
+++ b/lib/string.c
@@ -162,7 +162,7 @@ char * strncat(char *dest, const char *src, size_t count)
        if (count) {
                while (*dest)
                        dest++;
-               while ((*dest++ = *src++)) {
+               while ((*dest++ = *src++) != 0) {
                        if (--count == 0) {
                                *dest = '\0';
                                break;
@@ -445,8 +445,8 @@ void * memset(void * s,int c,size_t count)
 #ifndef __HAVE_ARCH_BCOPY
 /**
  * bcopy - Copy one area of memory to another
- * @src: Where to copy from
- * @dest: Where to copy to
+ * @srcp: Where to copy from
+ * @destp: Where to copy to
  * @count: The size of the area.
  *
  * Note that this is the same as memcpy(), with the arguments reversed.