[GNUnet-SVN] r1408 - GNUnet/src/util

[grothoff]

Author: grothoff
Date: 2005-07-12 06:52:52 -0700 (Tue, 12 Jul 2005)
New Revision: 1408

Modified:
   GNUnet/src/util/string.c
Log:
assert

Modified: GNUnet/src/util/string.c
===================================================================
--- GNUnet/src/util/string.c    2005-07-12 11:16:23 UTC (rev 1407)
+++ GNUnet/src/util/string.c    2005-07-12 13:52:52 UTC (rev 1408)
@@ -41,8 +41,13 @@
  */
 size_t strlcpy(char *dest, const char *src, size_t size)
 {
-       size_t ret = strlen(src);
+       size_t ret;
 
+       GNUNET_ASSERT(dest != NULL);
+       GNUNET_ASSERT(size > 0);
+       GNUNET_ASSERT(src != NULL);
+       ret = strlen(src);
+
        if (size) {
                size_t len = (ret >= size) ? size-1 : ret;
                memcpy(dest, src, len);
@@ -62,13 +67,18 @@
  */
 size_t strlcat(char *dest, const char *src, size_t count)
 {
-       size_t dsize = strlen(dest);
-       size_t len = strlen(src);
-       size_t res = dsize + len;
+       size_t dsize;
+       size_t len;
+       size_t res;
 
+       GNUNET_ASSERT(dest != NULL);
+       GNUNET_ASSERT(src != NULL);
+       GNUNET_ASSERT(count > 0);
+       dsize = strlen(dest);
+       len = strlen(src);
+       res = dsize + len;
        /* This would be a bug */
-       if(dsize >= count)
-               return 0;
+       GNUNET_ASSERT(dsize < count);
 
        dest += dsize;
        count -= dsize;