sysdeps: Remove _dbus_string_append_int()

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. Doing it this way might even be a little *more*
efficient, since it reduces reallocations; it's certainly more concise.

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

diff --git a/bus/driver.c b/bus/driver.c
index 7bc12f420b603be1d1e7bf41c0b407af4bccf524..ebd98015d479125db20b303b29aa5da18c3ec47d 100644 (file)
--- a/bus/driver.c
+++ b/bus/driver.c
@@ -416,16 +416,8 @@ create_unique_client_name (BusRegistry *registry,
 
       /* appname:MAJOR-MINOR */
 
-      if (!_dbus_string_append (str, ":"))
-        return FALSE;
-
-      if (!_dbus_string_append_int (str, next_major_number))
-        return FALSE;
-
-      if (!_dbus_string_append (str, "."))
-        return FALSE;
-
-      if (!_dbus_string_append_int (str, next_minor_number))
+      if (!_dbus_string_append_printf (str, ":%d.%d",
+                                       next_major_number, next_minor_number))
         return FALSE;
 
       next_minor_number += 1;

diff --git a/dbus/dbus-auth.c b/dbus/dbus-auth.c
index 09942f801897c2e75553169f41aedf66c95a4b22..3ce067049269dabf4f0288f0cde23b335ef27a6f 100644 (file)
--- a/dbus/dbus-auth.c
+++ b/dbus/dbus-auth.c
@@ -670,15 +670,9 @@ sha1_handle_first_client_response (DBusAuth         *auth,
                           &tmp2, _dbus_string_get_length (&tmp2)))
     goto out;
 
-  if (!_dbus_string_append (&tmp2, " "))
+  if (!_dbus_string_append_printf (&tmp2, " %d ", auth->cookie_id))
     goto out;
 
-  if (!_dbus_string_append_int (&tmp2, auth->cookie_id))
-    goto out;
-
-  if (!_dbus_string_append (&tmp2, " "))
-    goto out;  
-  
   if (!_dbus_generate_random_bytes (&tmp, N_CHALLENGE_BYTES, &error))
     {
       if (dbus_error_has_name (&error, DBUS_ERROR_NO_MEMORY))

diff --git a/dbus/dbus-keyring.c b/dbus/dbus-keyring.c
index f55b21a856ce1b543bbf211f9b40ecabd0106f2b..e3cbf0657ddd669e61d156a90b26ff851d34c563 100644 (file)
--- a/dbus/dbus-keyring.c
+++ b/dbus/dbus-keyring.c
@@ -566,18 +566,8 @@ _dbus_keyring_reload (DBusKeyring *keyring,
       i = 0;
       while (i < n_keys)
         {
-          if (!_dbus_string_append_int (&contents,
-                                        keys[i].id))
-            goto nomem;
-
-          if (!_dbus_string_append_byte (&contents, ' '))
-            goto nomem;
-
-          if (!_dbus_string_append_printf (&contents, "%" DBUS_INT64_MODIFIER "d",
-                                           keys[i].creation_time))
-            goto nomem;
-
-          if (!_dbus_string_append_byte (&contents, ' '))
+          if (!_dbus_string_append_printf (&contents, "%d %" DBUS_INT64_MODIFIER "d ",
+                                           keys[i].id, keys[i].creation_time))
             goto nomem;
 
           if (!_dbus_string_hex_encode (&keys[i].secret, 0,

diff --git a/dbus/dbus-string.h b/dbus/dbus-string.h
index 226890abfe3f232cb3ff1970e655ed113b7900b6..c12532ca5a4a95fde03c43ee8f781b8a95381391 100644 (file)
--- a/dbus/dbus-string.h
+++ b/dbus/dbus-string.h
@@ -212,9 +212,6 @@ dbus_bool_t   _dbus_string_append_len            (DBusString        *str,
                                                   const char        *buffer,
                                                   int                len);
 DBUS_PRIVATE_EXPORT
-dbus_bool_t   _dbus_string_append_int            (DBusString        *str,
-                                                  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-util-unix.c b/dbus/dbus-sysdeps-util-unix.c
index 49367d439053abf616145179ba40d88c5f3e628a..ce127388db4f003005200681b017d54b7ca890dc 100644 (file)
--- a/dbus/dbus-sysdeps-util-unix.c
+++ b/dbus/dbus-sysdeps-util-unix.c
@@ -273,8 +273,7 @@ _dbus_write_pid_to_file_and_pipe (const DBusString *pidfile,
           return FALSE;
         }
          
-      if (!_dbus_string_append_int (&pid, pid_to_write) ||
-          !_dbus_string_append (&pid, "\n"))
+      if (!_dbus_string_append_printf (&pid, DBUS_PID_FORMAT "\n", pid_to_write))
         {
           _dbus_string_free (&pid);
           _DBUS_SET_OOM (error);

diff --git a/dbus/dbus-sysdeps-util-win.c b/dbus/dbus-sysdeps-util-win.c
index befe1ba29eda650193d84ff9bd35995d3342e6b8..bb185f0527c2878b6a30da88dc25bd6f96c6dff3 100644 (file)
--- a/dbus/dbus-sysdeps-util-win.c
+++ b/dbus/dbus-sysdeps-util-win.c
@@ -203,8 +203,7 @@ _dbus_write_pid_to_file_and_pipe (const DBusString *pidfile,
           return FALSE;
         }
 
-      if (!_dbus_string_append_int (&pid, pid_to_write) ||
-          !_dbus_string_append (&pid, "\n"))
+      if (!_dbus_string_append_printf (&pid, DBUS_PID_FORMAT "\n", pid_to_write))
         {
           _dbus_string_free (&pid);
           _DBUS_SET_OOM (error);

diff --git a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c
index e4ba1ba66a2b7eff685f2508d8b94425baa22e40..ce9b7a75acecee1d05a57ade04c4986d29d6aca3 100644 (file)
--- a/dbus/dbus-sysdeps.c
+++ b/dbus/dbus-sysdeps.c
@@ -354,43 +354,6 @@ _dbus_split_paths_and_append (DBusString *dirs,
  *
  * @{
  */
-/**
- * Appends an 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_int (DBusString *str,
-                         long        value)
-{
-  /* this calculation is from comp.lang.c faq */
-#define MAX_LONG_LEN ((sizeof (long) * 8 + 2) / 3 + 1)  /* +1 for '-' */
-  int orig_len;
-  int i;
-  char *buf;
-  
-  orig_len = _dbus_string_get_length (str);
-
-  if (!_dbus_string_lengthen (str, MAX_LONG_LEN))
-    return FALSE;
-
-  buf = _dbus_string_get_data_len (str, orig_len, MAX_LONG_LEN);
-
-  snprintf (buf, MAX_LONG_LEN, "%ld", value);
-
-  i = 0;
-  while (*buf)
-    {
-      ++buf;
-      ++i;
-    }
-  
-  _dbus_string_shorten (str, MAX_LONG_LEN - i);
-  
-  return TRUE;
-}
 
 /**
  * Parses an integer contained in a DBusString. Either return parameter

diff --git a/test/internals/dbus-string-util.c b/test/internals/dbus-string-util.c
index d5a740c4fb50fdfd538d49b33c5429ec95f64f0b..3fb5ab6b62a9aa1fdac8c15f8badc951366fdd57 100644 (file)
--- a/test/internals/dbus-string-util.c
+++ b/test/internals/dbus-string-util.c
@@ -534,7 +534,7 @@ _dbus_string_test (const char *test_data_dir _DBUS_GNUC_UNUSED)
   if (!_dbus_string_init (&str))
     _dbus_test_fatal ("failed to init string");
 
-  if (!_dbus_string_append_int (&str, 27))
+  if (!_dbus_string_append_printf (&str, "%d", 27))
     _dbus_test_fatal ("failed to append int");
 
   i = _dbus_string_get_length (&str);

diff --git a/test/internals/misc-internals.c b/test/internals/misc-internals.c
index 3fc9d504dbc79e1f2e332599ac1598e2994a2367..1b26e34c8db555cfbaa2b9a349cef729d8af00db 100644 (file)
--- a/test/internals/misc-internals.c
+++ b/test/internals/misc-internals.c
@@ -660,11 +660,7 @@ _dbus_misc_test (const char *test_data_dir _DBUS_GNUC_UNUSED)
   if (!_dbus_string_init (&str))
     _dbus_test_fatal ("no memory");
 
-  if (!(_dbus_string_append_int (&str, major) &&
-        _dbus_string_append_byte (&str, '.') &&
-        _dbus_string_append_int (&str, minor) &&
-        _dbus_string_append_byte (&str, '.') &&
-        _dbus_string_append_int (&str, micro)))
+  if (!_dbus_string_append_printf (&str, "%d.%d.%d", major, minor, micro))
     _dbus_test_fatal ("no memory");
 
   _dbus_test_check (_dbus_string_equal_c_str (&str, DBUS_VERSION_STRING));