<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/20303">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">logging: Add 'length' argument to target->output() function<br><br>Pass the length of the formatted log string to the output callback<br>function, in case it may need it.<br><br>Change-Id: I0a92239831fe3d8a49a31b59073f7eb2e7e70ce6<br>---<br>M include/osmocom/core/logging.h<br>M src/logging.c<br>M src/logging_syslog.c<br>M src/loggingrb.c<br>M src/vty/logging_vty.c<br>5 files changed, 7 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/03/20303/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h</span><br><span>index 36ce941..318f75b 100644</span><br><span>--- a/include/osmocom/core/logging.h</span><br><span>+++ b/include/osmocom/core/logging.h</span><br><span>@@ -318,9 +318,10 @@</span><br><span>    *  \param[in] target logging target</span><br><span>          *  \param[in] level log level of currnet message</span><br><span>     *  \param[in] string the string that is to be written to the log</span><br><span style="color: hsl(120, 100%, 40%);">+      *  \param[in] len the length of 'string' in octets</span><br><span>   */</span><br><span>         void (*output) (struct log_target *target, unsigned int level,</span><br><span style="color: hsl(0, 100%, 40%);">-                   const char *string);</span><br><span style="color: hsl(120, 100%, 40%);">+                  const char *string, int len);</span><br><span> </span><br><span>    /*! alternative call-back function to which the logging</span><br><span>       *         framework passes the unfortmatted input arguments,</span><br><span>diff --git a/src/logging.c b/src/logging.c</span><br><span>index 212b0b9..8f8c33d 100644</span><br><span>--- a/src/logging.c</span><br><span>+++ b/src/logging.c</span><br><span>@@ -518,7 +518,7 @@</span><br><span>         }</span><br><span> err:</span><br><span>    buf[sizeof(buf)-1] = '\0';</span><br><span style="color: hsl(0, 100%, 40%);">-      target->output(target, level, buf);</span><br><span style="color: hsl(120, 100%, 40%);">+        target->output(target, level, buf, len);</span><br><span> }</span><br><span> </span><br><span> /* Catch internal logging category indexes as well as out-of-bounds indexes.</span><br><span>@@ -832,7 +832,7 @@</span><br><span> </span><br><span> #if (!EMBEDDED)</span><br><span> static void _file_output(struct log_target *target, unsigned int level,</span><br><span style="color: hsl(0, 100%, 40%);">-                     const char *log)</span><br><span style="color: hsl(120, 100%, 40%);">+                      const char *log, int len)</span><br><span> {</span><br><span>      fprintf(target->tgt_file.out, "%s", log);</span><br><span>       fflush(target->tgt_file.out);</span><br><span>diff --git a/src/logging_syslog.c b/src/logging_syslog.c</span><br><span>index f980689..fa457a2 100644</span><br><span>--- a/src/logging_syslog.c</span><br><span>+++ b/src/logging_syslog.c</span><br><span>@@ -58,8 +58,7 @@</span><br><span>            return LOG_DEBUG;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void _syslog_output(struct log_target *target,</span><br><span style="color: hsl(0, 100%, 40%);">-                    unsigned int level, const char *log)</span><br><span style="color: hsl(120, 100%, 40%);">+static void _syslog_output(struct log_target *target, unsigned int level, const char *log, int len)</span><br><span> {</span><br><span>    syslog(logp2syslog_level(level), "%s", log);</span><br><span> }</span><br><span>diff --git a/src/loggingrb.c b/src/loggingrb.c</span><br><span>index 4a80cc8..caf6e1d 100644</span><br><span>--- a/src/loggingrb.c</span><br><span>+++ b/src/loggingrb.c</span><br><span>@@ -37,8 +37,7 @@</span><br><span> #include <osmocom/core/logging.h></span><br><span> #include <osmocom/core/loggingrb.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void _rb_output(struct log_target *target,</span><br><span style="color: hsl(0, 100%, 40%);">-                     unsigned int level, const char *log)</span><br><span style="color: hsl(120, 100%, 40%);">+static void _rb_output(struct log_target *target, unsigned int level, const char *log, int len)</span><br><span> {</span><br><span>         osmo_strrb_add(target->tgt_rb.rb, log);</span><br><span> }</span><br><span>diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c</span><br><span>index bd513e3..10346d1 100644</span><br><span>--- a/src/vty/logging_vty.c</span><br><span>+++ b/src/vty/logging_vty.c</span><br><span>@@ -79,8 +79,7 @@</span><br><span>  *</span><br><span>  */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void _vty_output(struct log_target *tgt,</span><br><span style="color: hsl(0, 100%, 40%);">-                    unsigned int level, const char *line)</span><br><span style="color: hsl(120, 100%, 40%);">+static void _vty_output(struct log_target *tgt, unsigned int level, const char *line, int len)</span><br><span> {</span><br><span>   struct vty *vty = tgt->tgt_vty.vty;</span><br><span>       vty_out(vty, "%s", line);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/20303">change 20303</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/libosmocore/+/20303"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I0a92239831fe3d8a49a31b59073f7eb2e7e70ce6 </div>
<div style="display:none"> Gerrit-Change-Number: 20303 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>