From 96670e95711f2817e014cdc164b27633ff6e91e5 Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Sat, 30 Oct 2010 18:43:20 +0200 Subject: [PATCH] assoc_file_name(): return length of string --- citadel/include/citadel_dirs.h | 6 ++++-- citadel/utillib/citadel_dirs.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/citadel/include/citadel_dirs.h b/citadel/include/citadel_dirs.h index 19856270a..d3bc77b6b 100644 --- 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 1aecdcded..dfa7e65bc 100644 --- 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); } -- 2.30.2