Change in libosmocore[master]: tdef: Return correct snprintf value for osmo_tdef_range_str_buf()

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

laforge gerrit-no-reply at lists.osmocom.org
Fri Oct 18 09:20:58 UTC 2019


laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15779 )

Change subject: tdef: Return correct snprintf value for osmo_tdef_range_str_buf()
......................................................................

tdef: Return correct snprintf value for osmo_tdef_range_str_buf()

len provides extra information in the case the buffer was too small,
because it tells the caller "the number of characters (excluding the
terminating null byte) which would have been written to the final
string if enough space had been available" (man
snprintf).

Change-Id: Icafe559e19a92e2ae72fdd0dd2d9a394b1eda878
---
M src/tdef.c
1 file changed, 4 insertions(+), 2 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/tdef.c b/src/tdef.c
index 94d987f..71a3315 100644
--- a/src/tdef.c
+++ b/src/tdef.c
@@ -256,7 +256,9 @@
  * \param[in] buf  The buffer where the string representation is stored.
  * \param[in] buf_len  Length of buffer in bytes.
  * \param[in] tdef  Timer entry from a timer definition table.
- * \return The number of characters printed on success, negative on error. See snprintf().
+ * \return The number of characters printed on success (or number of characters
+ *         which would have been written to the final string if enough space
+ *         had been available), negative on error. See snprintf().
  */
 int osmo_tdef_range_str_buf(char *buf, size_t buf_len, struct osmo_tdef *t)
 {
@@ -275,7 +277,7 @@
 	if (ret < 0)
 		return ret;
 	OSMO_SNPRINTF_RET(ret, rem, offset, len);
-	return ret;
+	return len;
 }
 
 /*! Using osmo_tdef for osmo_fsm_inst: find a given state's osmo_tdef_state_timeout entry.

-- 
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15779
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Icafe559e19a92e2ae72fdd0dd2d9a394b1eda878
Gerrit-Change-Number: 15779
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <axilirator at gmail.com>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20191018/cc552eb9/attachment.htm>


More information about the gerrit-log mailing list