summaryrefslogtreecommitdiff
path: root/util.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2004-02-07 00:12:40 +0000
committerWayne Davison <wayned@samba.org>2004-02-07 00:12:40 +0000
commita8f7e4b835a39b180ee728bfe8c44650096f99c0 (patch)
treeb179f42dc4687b7528f529a132487ca93fa3019c /util.c
parent9352b0649b8d6aa21d9d567c1d819a0fa26c7b01 (diff)
downloadrsync-a8f7e4b835a39b180ee728bfe8c44650096f99c0.tar.gz
Made a couple comments a little clearer.
Diffstat (limited to 'util.c')
-rw-r--r--util.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/util.c b/util.c
index 13ab38e3..fd01283a 100644
--- a/util.c
+++ b/util.c
@@ -558,8 +558,8 @@ void strlower(char *s)
/* Join strings p1 & p2 into "dest" with a guaranteed '/' between them. (If
* p1 ends with a '/', no extra '/' is inserted.) Returns the length of both
- * strings + 1 (if '/' was inserted), regardless of whether the whole thing
- * fits into destsize (including the terminating '\0'). */
+ * strings + 1 (if '/' was inserted), regardless of whether the null-terminated
+ * string fits into destsize. */
size_t pathjoin(char *dest, size_t destsize, const char *p1, const char *p2)
{
size_t len = strlcpy(dest, p1, destsize);
@@ -579,9 +579,9 @@ size_t pathjoin(char *dest, size_t destsize, const char *p1, const char *p2)
}
/* Join any number of strings together, putting them in "dest". The return
- * value is the length of all the strings, regardless of whether they fit in
- * destsize (including the terminating '\0'). Your list of string pointers
- * should end with a NULL to indicate the end of the list. */
+ * value is the length of all the strings, regardless of whether the null-
+ * terminated whole fits in destsize. Your list of string pointers must end
+ * with a NULL to indicate the end of the list. */
size_t stringjoin(char *dest, size_t destsize, ...)
{
va_list ap;