From: Wilfried Goesgens <dothebart@citadel.org>
Date: Sat, 30 Oct 2010 16:43:20 +0000 (+0200)
Subject: assoc_file_name(): return length of string
X-Git-Tag: v8.01~627
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=4b62e4966319b8d7b02242643d7033da4c92d657

assoc_file_name(): return length of string
---

diff --git a/citadel/include/citadel_dirs.h b/citadel/include/citadel_dirs.h
index 147bf0276..b6039e1d9 100644
--- a/citadel/include/citadel_dirs.h
+++ b/citadel/include/citadel_dirs.h
@@ -63,7 +63,7 @@ extern void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ct
 
 extern void create_run_directories(long UID, long GUID);
 
-extern void assoc_file_name(char *buf, 
+extern size_t assoc_file_name(char *buf, 
 			    size_t n,
 			    struct ctdlroom *qrbuf, 
 			    const char *prefix);
diff --git a/citadel/utillib/citadel_dirs.c b/citadel/utillib/citadel_dirs.c
index 8863b46bd..f4cc31071 100644
--- a/citadel/utillib/citadel_dirs.c
+++ b/citadel/utillib/citadel_dirs.c
@@ -379,10 +379,10 @@ void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ctdldir,
 /*
  * Generate an associated file name for a room
  */
-void assoc_file_name(char *buf, size_t n,
+size_t assoc_file_name(char *buf, size_t n,
 		     struct ctdlroom *qrbuf, const char *prefix)
 {
-	snprintf(buf, n, "%s%ld", prefix, qrbuf->QRnumber);
+	return snprintf(buf, n, "%s%ld", prefix, qrbuf->QRnumber);
 }