assoc_file_name(): return length of string

diff --git a/citadel/include/citadel_dirs.h b/citadel/include/citadel_dirs.h
index 19856270a91d532b980823d0293920c0f8118818..d3bc77b6bf495e39df688128b9841712ed7b1137 100644 (file)
--- a/citadel/include/citadel_dirs.h
+++ b/citadel/include/citadel_dirs.h
@@ -60,7 +60,9 @@ extern char file_funambol_msg[PATH_MAX];
 extern void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ctdldir, int dbg);
 
 
-void assoc_file_name(char *buf, size_t n,
-                    struct ctdlroom *qrbuf, const char *prefix);
+extern size_t assoc_file_name(char *buf, 
+                           size_t n,
+                           struct ctdlroom *qrbuf, 
+                           const char *prefix);
 
 #endif /* __CITADEL_DIRS_H */

diff --git a/citadel/utillib/citadel_dirs.c b/citadel/utillib/citadel_dirs.c
index 1aecdcded837b4ed4046fed42ba496169aab899c..dfa7e65bc746a60d05793044b287327ce448a964 100644 (file)
--- a/citadel/utillib/citadel_dirs.c
+++ b/citadel/utillib/citadel_dirs.c
@@ -373,9 +373,9 @@ 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);
 }