From: Simon McVittie <smcv@collabora.com>
Date: Wed, 23 Aug 2023 10:57:44 +0000 (+0100)
Subject: sysdeps: Remove _dbus_string_append_uint()
X-Git-Tag: dbus-1.15.10~12^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac20c7a4ec2ae0db5cc0aea6db264d1d43801c50;p=thirdparty%2Fdbus.git

sysdeps: Remove _dbus_string_append_uint()

It's a wrapper around snprintf(), so we are not gaining any efficiency
versus _dbus_string_append_printf(), and might as well use the more
general function instead.

Signed-off-by: Simon McVittie <smcv@collabora.com>
---

diff --git a/bus/apparmor.c b/bus/apparmor.c
index fe6cb3053..257cf3602 100644
--- a/bus/apparmor.c
+++ b/bus/apparmor.c
@@ -215,10 +215,7 @@ static dbus_bool_t
 _dbus_append_pair_uint (DBusString *auxdata, const char *name,
                        unsigned long value)
 {
-  return _dbus_string_append (auxdata, " ") &&
-         _dbus_string_append (auxdata, name) &&
-         _dbus_string_append (auxdata, "=") &&
-         _dbus_string_append_uint (auxdata, value);
+  return _dbus_string_append_printf (auxdata, " %s=%lu", name, value);
 }
 
 static dbus_bool_t
diff --git a/bus/selinux.c b/bus/selinux.c
index 16665f452..200914b96 100644
--- a/bus/selinux.c
+++ b/bus/selinux.c
@@ -496,10 +496,7 @@ bus_selinux_allows_acquire_service (DBusConnection     *connection,
 
   if (spid)
     {
-      if (!_dbus_string_append (&auxdata, " spid="))
-	goto oom;
-
-      if (!_dbus_string_append_uint (&auxdata, spid))
+      if (!_dbus_string_append_printf (&auxdata, " spid=%lu", spid))
 	goto oom;
     }
   
@@ -608,19 +605,13 @@ bus_selinux_allows_send (DBusConnection     *sender,
 
   if (spid)
     {
-      if (!_dbus_string_append (&auxdata, " spid="))
-	goto oom;
-
-      if (!_dbus_string_append_uint (&auxdata, spid))
+      if (!_dbus_string_append_printf (&auxdata, " spid=%lu", spid))
 	goto oom;
     }
 
   if (tpid)
     {
-      if (!_dbus_string_append (&auxdata, " tpid="))
-	goto oom;
-
-      if (!_dbus_string_append_uint (&auxdata, tpid))
+      if (!_dbus_string_append_printf (&auxdata, " tpid=%lu", tpid))
 	goto oom;
     }
 
diff --git a/dbus/dbus-string.h b/dbus/dbus-string.h
index be2434db1..226890abf 100644
--- a/dbus/dbus-string.h
+++ b/dbus/dbus-string.h
@@ -215,9 +215,6 @@ DBUS_PRIVATE_EXPORT
 dbus_bool_t   _dbus_string_append_int            (DBusString        *str,
                                                   long               value);
 DBUS_PRIVATE_EXPORT
-dbus_bool_t   _dbus_string_append_uint           (DBusString        *str,
-                                                  unsigned long      value);
-DBUS_PRIVATE_EXPORT
 dbus_bool_t   _dbus_string_append_byte           (DBusString        *str,
                                                   unsigned char      byte);
 DBUS_PRIVATE_EXPORT
diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
index cf99616de..eec9b20cf 100644
--- a/dbus/dbus-sysdeps-unix.c
+++ b/dbus/dbus-sysdeps-unix.c
@@ -3112,8 +3112,7 @@ out:
 dbus_bool_t
 _dbus_append_user_from_current_process (DBusString *str)
 {
-  return _dbus_string_append_uint (str,
-                                   _dbus_geteuid ());
+  return _dbus_string_append_printf (str, DBUS_UID_FORMAT, _dbus_geteuid ());
 }
 
 /**
diff --git a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c
index 8b82bfd52..e4ba1ba66 100644
--- a/dbus/dbus-sysdeps.c
+++ b/dbus/dbus-sysdeps.c
@@ -392,44 +392,6 @@ _dbus_string_append_int (DBusString *str,
   return TRUE;
 }
 
-/**
- * Appends an unsigned integer to a DBusString.
- * 
- * @param str the string
- * @param value the integer value
- * @returns #FALSE if not enough memory or other failure.
- */
-dbus_bool_t
-_dbus_string_append_uint (DBusString    *str,
-                          unsigned long  value)
-{
-  /* this is wrong, but definitely on the high side. */
-#define MAX_ULONG_LEN (MAX_LONG_LEN * 2)
-  int orig_len;
-  int i;
-  char *buf;
-  
-  orig_len = _dbus_string_get_length (str);
-
-  if (!_dbus_string_lengthen (str, MAX_ULONG_LEN))
-    return FALSE;
-
-  buf = _dbus_string_get_data_len (str, orig_len, MAX_ULONG_LEN);
-
-  snprintf (buf, MAX_ULONG_LEN, "%lu", value);
-
-  i = 0;
-  while (*buf)
-    {
-      ++buf;
-      ++i;
-    }
-  
-  _dbus_string_shorten (str, MAX_ULONG_LEN - i);
-  
-  return TRUE;
-}
-
 /**
  * Parses an integer contained in a DBusString. Either return parameter
  * may be #NULL if you aren't interested in it. The integer is parsed