From: Mike Brady <4265913+mikebrady@users.noreply.github.com>
Date: Thu, 16 Dec 2021 09:47:50 +0000 (+0000)
Subject: slightly simplify function generate_preliminary_string.
X-Git-Tag: 4.1-rc1~24^2~342
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a23ff5224d692669076bf8f784dff6e696eda69;p=thirdparty%2Fshairport-sync.git

slightly simplify function generate_preliminary_string.
---

diff --git a/common.c b/common.c
index 53cc13b5..4ac0e2fe 100644
--- a/common.c
+++ b/common.c
@@ -432,27 +432,22 @@ void set_requested_connection_state_to_output(int v) { requested_connection_stat
 
 char *generate_preliminary_string(char *buffer, size_t buffer_length, double tss, double tsl,
                                   const char *filename, const int linenumber, const char *prefix) {
-  size_t space_remaining = buffer_length;
   char *insertion_point = buffer;
   if (config.debugger_show_elapsed_time) {
-    snprintf(insertion_point, space_remaining, "% 20.9f", tss);
+    snprintf(insertion_point, buffer_length, "% 20.9f", tss);
     insertion_point = insertion_point + strlen(insertion_point);
-    space_remaining = space_remaining - strlen(insertion_point);
   }
   if (config.debugger_show_relative_time) {
-    snprintf(insertion_point, space_remaining, "% 20.9f", tsl);
+    snprintf(insertion_point, buffer_length, "% 20.9f", tsl);
     insertion_point = insertion_point + strlen(insertion_point);
-    space_remaining = space_remaining - strlen(insertion_point);
   }
   if (config.debugger_show_file_and_line) {
-    snprintf(insertion_point, space_remaining, " \"%s:%d\"", filename, linenumber);
+    snprintf(insertion_point, buffer_length, " \"%s:%d\"", filename, linenumber);
     insertion_point = insertion_point + strlen(insertion_point);
-    space_remaining = space_remaining - strlen(insertion_point);
   }
   if (prefix) {
-    snprintf(insertion_point, space_remaining, "%s", prefix);
+    snprintf(insertion_point, buffer_length, "%s", prefix);
     insertion_point = insertion_point + strlen(insertion_point);
-    space_remaining = space_remaining - strlen(insertion_point);
   }
   return insertion_point;
 }
diff --git a/configure.ac b/configure.ac
index 0af2d024..a3c9a529 100644
--- a/configure.ac
+++ b/configure.ac
@@ -373,7 +373,7 @@ AC_ARG_WITH(mpris-test-client, [AS_HELP_STRING([--with-mpris-test-client],[compi
 AM_CONDITIONAL([USE_MPRIS_CLIENT], [test "x$with_mpris_test_client" = "xyes"])
 
 if test "x$with_mpris_test_client" = "xyes" || test "x$with_dbus_test_client" = "xyes" || test "x$with_mpris_interface" = "xyes" || test "x$with_dbus_interface" = "xyes" ; then
-  PKG_CHECK_MODULES([glib], [gio-unix-2.0 >= 2.30.0],[CFLAGS="${glib_CFLAGS} ${CFLAGS}" LIBS="${glib_LIBS} ${LIBS}"],[AC_MSG_ERROR(MPRIS client support requires the glib 2.0 library -- libglib2.0-dev suggested!)])
+  PKG_CHECK_MODULES([glib], [gio-unix-2.0 >= 2.30.0],[CFLAGS="${glib_CFLAGS} ${CFLAGS}" LIBS="${glib_LIBS} ${LIBS}"],[AC_MSG_ERROR(the glib 2.0 library is required -- libglib2.0-dev suggested!)])
 fi
 
 # Look for mqtt flag