Attachment 115230 Details for Bug 90089 – text file that lists cast warnings on MSC 64-bit without white-space changes

[patch] text file that lists cast warnings on MSC 64-bit without white-space changes

diffs-rony2.txt (text/plain), 12.67 KB, created by rony on 2015-04-20 16:45:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: rony

Created: 2015-04-20 16:45:24 UTC

Size: 12.67 KB

patch

obsolete

>diff --git a/bus/driver.c b/bus/driver.c
>index 23e75a2..bef02f6 100644
>--- a/bus/driver.c
>+++ b/bus/driver.c
>@@ -1734,7 +1734,7 @@ bus_driver_handle_get_connection_credentials (DBusConnection *connection,
>       /* use the GVariant bytestring convention for strings of unknown
>        * encoding: include the \0 in the payload, for zero-copy reading */
>       if (!_dbus_asv_add_byte_array (&array_iter, "LinuxSecurityLabel",
>-                                     s, strlen (s) + 1))
>+                                     s, (int) strlen (s) + 1))
>         {
>           dbus_free (s);
>           goto oom;
>diff --git a/bus/signals.c b/bus/signals.c
>index e8def9f..ff1e04b 100644
>--- a/bus/signals.c
>+++ b/bus/signals.c
>@@ -848,7 +848,7 @@ bus_match_rule_parse_arg_match (BusMatchRule     *rule,
> 
>   if (end != length)
>     {
>-      int len1 = strlen ("path");
>+      int len1 = (int) strlen ("path");
>       if ((end + len1) == length &&
>           _dbus_string_ends_with_c_str (&key_str, "path"))
>         {
>@@ -1940,7 +1940,7 @@ match_rule_matches (BusMatchRule    *rule,
>       if (!str_has_prefix (path, rule->path))
>         return FALSE;
> 
>-      len = strlen (rule->path);
>+      len = (int) strlen (rule->path);
> 
>       /* Check that the actual argument is within the expected
>        * namespace, rather than just starting with that string,
>@@ -1991,7 +1991,7 @@ match_rule_matches (BusMatchRule    *rule,
>               dbus_message_iter_get_basic (&iter, &actual_arg);
>               _dbus_assert (actual_arg != NULL);
> 
>-              actual_length = strlen (actual_arg);
>+              actual_length = (int) strlen (actual_arg);
> 
>               if (is_path)
>                 {
>diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c
>index 8952b75..9fe15a1 100644
>--- a/dbus/dbus-connection.c
>+++ b/dbus/dbus-connection.c
>@@ -5665,7 +5665,7 @@ _dbus_connection_register_object_path (DBusConnection              *connection,
>   char **decomposed_path;
>   dbus_bool_t retval;
> 
>-  if (!_dbus_decompose_path (path, strlen (path), &decomposed_path, NULL))
>+  if (!_dbus_decompose_path (path, (int) strlen (path), &decomposed_path, NULL))
>     return FALSE;
> 
>   CONNECTION_LOCK (connection);
>@@ -5841,7 +5841,7 @@ dbus_connection_unregister_object_path (DBusConnection              *connection,
>   _dbus_return_val_if_fail (path != NULL, FALSE);
>   _dbus_return_val_if_fail (path[0] == '/', FALSE);
> 
>-  if (!_dbus_decompose_path (path, strlen (path), &decomposed_path, NULL))
>+  if (!_dbus_decompose_path (path, (int) strlen (path), &decomposed_path, NULL))
>       return FALSE;
> 
>   CONNECTION_LOCK (connection);
>@@ -5876,7 +5876,7 @@ dbus_connection_get_object_path_data (DBusConnection *connection,
> 
>   *data_p = NULL;
> 
>-  if (!_dbus_decompose_path (path, strlen (path), &decomposed_path, NULL))
>+  if (!_dbus_decompose_path (path, (int) strlen (path), &decomposed_path, NULL))
>     return FALSE;
> 
>   CONNECTION_LOCK (connection);
>@@ -5912,7 +5912,7 @@ dbus_connection_list_registered (DBusConnection              *connection,
>   _dbus_return_val_if_fail (parent_path[0] == '/', FALSE);
>   _dbus_return_val_if_fail (child_entries != NULL, FALSE);
> 
>-  if (!_dbus_decompose_path (parent_path, strlen (parent_path), &decomposed_path, NULL))
>+  if (!_dbus_decompose_path (parent_path, (int) strlen (parent_path), &decomposed_path, NULL))
>     return FALSE;
> 
>   CONNECTION_LOCK (connection);
>diff --git a/dbus/dbus-internals.c b/dbus/dbus-internals.c
>index c7f81e5..950a7eb 100644
>--- a/dbus/dbus-internals.c
>+++ b/dbus/dbus-internals.c
>@@ -415,7 +415,7 @@ _dbus_verbose_real (
> #endif
> 
>   /* Only print pid again if the next line is a new line */
>-  len = strlen (format);
>+  len = (int) strlen (format);
>   if (format[len-1] == '\n')
>     need_pid = TRUE;
>   else
>diff --git a/dbus/dbus-marshal-basic.c b/dbus/dbus-marshal-basic.c
>index 74fe3f9..4455c29 100644
>--- a/dbus/dbus-marshal-basic.c
>+++ b/dbus/dbus-marshal-basic.c
>@@ -757,7 +757,7 @@ marshal_string (DBusString    *str,
> {
>   return marshal_len_followed_by_bytes (MARSHAL_AS_STRING,
>                                         str, insert_at, value,
>-                                        strlen (value),
>+                                        (int) strlen (value),
>                                         byte_order, pos_after);
> }
> 
>@@ -769,7 +769,7 @@ marshal_signature (DBusString    *str,
> {
>   return marshal_len_followed_by_bytes (MARSHAL_AS_SIGNATURE,
>                                         str, insert_at, value,
>-                                        strlen (value),
>+                                        (int) strlen (value),
>                                         DBUS_COMPILER_BYTE_ORDER, /* irrelevant */
>                                         pos_after);
> }
>diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c
>index 22da695..4588afa 100644
>--- a/dbus/dbus-message.c
>+++ b/dbus/dbus-message.c
>@@ -3174,7 +3174,7 @@ dbus_message_get_path_decomposed (DBusMessage   *message,
>   v = dbus_message_get_path (message);
>   if (v != NULL)
>     {
>-      if (!_dbus_decompose_path (v, strlen (v),
>+      if (!_dbus_decompose_path (v, (int) strlen (v),
>                                  path, NULL))
>         return FALSE;
>     }
>diff --git a/dbus/dbus-object-tree.c b/dbus/dbus-object-tree.c
>index e2a3b73..43a74cc 100644
>--- a/dbus/dbus-object-tree.c
>+++ b/dbus/dbus-object-tree.c
>@@ -1110,7 +1110,7 @@ allocate_subtree_object (const char *name)
> 
>   _dbus_assert (name != NULL);
> 
>-  len = strlen (name);
>+  len = (int) strlen (name);
> 
>   subtree = dbus_malloc0 (MAX (front_padding + (len + 1), sizeof (DBusObjectSubtree)));
> 
>@@ -1630,18 +1630,18 @@ run_decompose_tests (void)
>       int    expected_len;
> 
>       if (!_dbus_decompose_path (decompose_tests[i].path,
>-                                 strlen (decompose_tests[i].path),
>+                                 (int) strlen (decompose_tests[i].path),
>                                  &result, &result_len))
>         return FALSE;
> 
>-      expected_len = string_array_length (decompose_tests[i].result);
>+      expected_len = (int) string_array_length (decompose_tests[i].result);
> 
>       if (result_len != (int) string_array_length ((const char**)result) ||
>           expected_len != result_len ||
>           path_contains (decompose_tests[i].result,
>                          (const char**) result) != STR_EQUAL)
>         {
>-          int real_len = string_array_length ((const char**)result);
>+          int real_len = (int) string_array_length ((const char**)result);
>           _dbus_warn ("Expected decompose of %s to have len %d, returned %d, appears to have %d\n",
>                       decompose_tests[i].path, expected_len, result_len,
>                       real_len);
>@@ -1875,7 +1875,7 @@ object_tree_test_iteration (void *data)
>     _dbus_object_tree_list_registered_unlocked (tree, path1, &child_entries);
>     if (child_entries != NULL)
>       {
>-	nb = string_array_length ((const char**)child_entries);
>+	nb = (int) string_array_length ((const char**)child_entries);
> 	_dbus_assert (nb == 1);
> 	dbus_free_string_array (child_entries);
>       }
>@@ -1883,7 +1883,7 @@ object_tree_test_iteration (void *data)
>     _dbus_object_tree_list_registered_unlocked (tree, path2, &child_entries);
>     if (child_entries != NULL)
>       {
>-	nb = string_array_length ((const char**)child_entries);
>+	nb = (int) string_array_length ((const char**)child_entries);
> 	_dbus_assert (nb == 2);
> 	dbus_free_string_array (child_entries);
>       }
>@@ -1891,7 +1891,7 @@ object_tree_test_iteration (void *data)
>     _dbus_object_tree_list_registered_unlocked (tree, path8, &child_entries);
>     if (child_entries != NULL)
>       {
>-	nb = string_array_length ((const char**)child_entries);
>+	nb = (int) string_array_length ((const char**)child_entries);
> 	_dbus_assert (nb == 0);
> 	dbus_free_string_array (child_entries);
>       }
>@@ -1899,7 +1899,7 @@ object_tree_test_iteration (void *data)
>     _dbus_object_tree_list_registered_unlocked (tree, root, &child_entries);
>     if (child_entries != NULL)
>       {
>-	nb = string_array_length ((const char**)child_entries);
>+	nb = (int) string_array_length ((const char**)child_entries);
> 	_dbus_assert (nb == 3);
> 	dbus_free_string_array (child_entries);
>       }
>diff --git a/dbus/dbus-sha.c b/dbus/dbus-sha.c
>index febfba2..21d289e 100644
>--- a/dbus/dbus-sha.c
>+++ b/dbus/dbus-sha.c
>@@ -550,7 +550,7 @@ static dbus_bool_t
> check_sha_str (const char *input,
>                const char *expected)
> {
>-  return check_sha_binary (input, strlen (input), expected);
>+  return check_sha_binary (input, (int) strlen (input), expected);
> }
> 
> static dbus_bool_t
>diff --git a/dbus/dbus-spawn-win.c b/dbus/dbus-spawn-win.c
>index f7b56d1..64d6a90 100644
>--- a/dbus/dbus-spawn-win.c
>+++ b/dbus/dbus-spawn-win.c
>@@ -507,7 +507,7 @@ compose_string (char **strings, char separator)
>   if (!strings || !strings[0])
>     return 0;
>   for (i = 0; strings[i]; i++)
>-    n += strlen (strings[i]) + 1;
>+    n += (int) strlen (strings[i]) + 1;
>   n++;
> 
>   buf = p = malloc (n);
>diff --git a/dbus/dbus-string-util.c b/dbus/dbus-string-util.c
>index 3babc05..76d3f2b 100644
>--- a/dbus/dbus-string-util.c
>+++ b/dbus/dbus-string-util.c
>@@ -54,7 +54,7 @@ _dbus_string_ends_with_c_str (const DBusString *a,
>   DBUS_GENERIC_STRING_PREAMBLE (real_a);
>   _dbus_assert (c_str != NULL);
> 
>-  c_str_len = strlen (c_str);
>+  c_str_len = (int) strlen (c_str);
>   if (((unsigned long)real_a->len) < c_str_len)
>     return FALSE;
> 
>@@ -129,7 +129,7 @@ test_hex_roundtrip (const unsigned char *data,
>   int end;
> 
>   if (len < 0)
>-    len = strlen (data);
>+    len = (int) strlen (data);
> 
>   if (!_dbus_string_init (&orig))
>     _dbus_assert_not_reached ("could not init string");
>diff --git a/dbus/dbus-string.c b/dbus/dbus-string.c
>index 98d9f2b..1f5a446 100644
>--- a/dbus/dbus-string.c
>+++ b/dbus/dbus-string.c
>@@ -193,7 +193,7 @@ _dbus_string_init_const (DBusString *str,
>   _dbus_assert (value != NULL);
> 
>   _dbus_string_init_const_len (str, value,
>-                               strlen (value));
>+                               (int) strlen (value));
> }
> 
> /**
>@@ -940,7 +940,7 @@ _dbus_string_append (DBusString *str,
>   DBUS_STRING_PREAMBLE (str);
>   _dbus_assert (buffer != NULL);
> 
>-  buffer_len = strlen (buffer);
>+  buffer_len = (int) strlen (buffer);
>   if (buffer_len > (unsigned long) _DBUS_STRING_MAX_LENGTH)
>     return FALSE;
> 
>diff --git a/dbus/dbus-sysdeps-util-win.c b/dbus/dbus-sysdeps-util-win.c
>index e83c539..f0204af 100644
>--- a/dbus/dbus-sysdeps-util-win.c
>+++ b/dbus/dbus-sysdeps-util-win.c
>@@ -117,7 +117,7 @@ _dbus_write_pid_file (const DBusString *filename,
>     }
> 
>   total = 0;
>-  bytes_to_write = strlen (pidstr);;
>+  bytes_to_write = (int) strlen (pidstr);;
> 
>   while (total < bytes_to_write)
>     {
>diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
>index 6e59c5e..3d341d1 100644
>--- a/dbus/dbus-sysdeps-win.c
>+++ b/dbus/dbus-sysdeps-win.c
>@@ -1568,7 +1568,7 @@ _dbus_connect_tcp_socket_with_nonce (const char     *host,
>         }
>       _DBUS_ASSERT_ERROR_IS_CLEAR(error);
> 
>-      if (connect (fd, (struct sockaddr*) tmp->ai_addr, tmp->ai_addrlen) == SOCKET_ERROR)
>+      if (connect (fd, (struct sockaddr*) tmp->ai_addr, (int) tmp->ai_addrlen) == SOCKET_ERROR)
>         {
>           DBUS_SOCKET_SET_ERRNO ();
>           closesocket(fd);
>@@ -1720,7 +1720,7 @@ _dbus_listen_tcp_socket (const char     *host,
>         }
>       _DBUS_ASSERT_ERROR_IS_CLEAR(error);
> 
>-      if (bind (fd, (struct sockaddr*) tmp->ai_addr, tmp->ai_addrlen) == SOCKET_ERROR)
>+      if (bind (fd, (struct sockaddr*) tmp->ai_addr, (int) tmp->ai_addrlen) == SOCKET_ERROR)
>         {
>           DBUS_SOCKET_SET_ERRNO ();
>           closesocket (fd);
>@@ -2966,7 +2966,7 @@ _dbus_daemon_publish_session_bus_address (const char* address, const char *scope
> 
>   // create shm
>   hDBusSharedMem = CreateFileMappingA( INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE,
>-                                       0, strlen( address ) + 1, _dbus_string_get_const_data(&shm_name) );
>+                                       0, (int) strlen( address ) + 1, _dbus_string_get_const_data(&shm_name) );
>   _dbus_assert( hDBusSharedMem );
> 
>   shared_addr = MapViewOfFile( hDBusSharedMem, FILE_MAP_WRITE, 0, 0, 0 );
>diff --git a/tools/dbus-monitor.c b/tools/dbus-monitor.c
>index 9cec0a7..b4c6a63 100644
>--- a/tools/dbus-monitor.c
>+++ b/tools/dbus-monitor.c
>@@ -426,7 +426,7 @@ main (int argc, char *argv[])
>           /* Prepend a rule (and a comma) to enable the monitor to eavesdrop.
>            * Prepending allows the user to add eavesdrop=false at command line
>            * in order to disable eavesdropping when needed */
>-          filter_len = strlen (EAVESDROPPING_RULE) + 1 + strlen (arg) + 1;
>+          filter_len = (int) strlen (EAVESDROPPING_RULE) + 1 + (int) strlen (arg) + 1;
> 
>           filters = (char **) realloc (filters, numFilters * sizeof (char *));
>           if (filters == NULL)

Actions: View | Splinter Review

Attachments on bug 90089: 115179 | 115180 | 115181 | 115214 | 115215 | 115216 | 115228 | 115230 | 115407 | 115412 | 115455 | 115746 | 115748

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.