fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2025-12-31 21:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

dbus-message.c: unused variable bytes_read in _dbus_message_loader_get_buffer

Browse source 
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=70218
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
This commit is contained in:
Vasiliy Balyasnyy 2013-10-08 13:36:38 +04:00 • committed by Simon McVittie
parent 1451f946c1
commit ecd4262cbf
5 changed files with 14 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dbus/dbus-message-internal.h
View file

@ -70,8 +70,7 @@ void _dbus_message_loader_unref (DBusMessageLoader
void _dbus_message_loader_get_buffer (DBusMessageLoader *loader,
DBusString **buffer);
void _dbus_message_loader_return_buffer (DBusMessageLoader *loader,
DBusString *buffer,
int bytes_read);
DBusString *buffer);
dbus_bool_t _dbus_message_loader_get_unix_fds (DBusMessageLoader *loader,
int **fds,

10
dbus/dbus-message-util.c
View file

@ -493,7 +493,7 @@ dbus_internal_do_not_use_try_message_data (const DBusString *data,
_dbus_message_loader_get_buffer (loader, &buffer);
_dbus_string_append_byte (buffer,
_dbus_string_get_byte (data, i));
_dbus_message_loader_return_buffer (loader, buffer, 1);
_dbus_message_loader_return_buffer (loader, buffer);
}
if (!check_loader_results (loader, expected_validity))
@ -512,7 +512,7 @@ dbus_internal_do_not_use_try_message_data (const DBusString *data,
_dbus_message_loader_get_buffer (loader, &buffer);
_dbus_string_copy (data, 0, buffer,
_dbus_string_get_length (buffer));
_dbus_message_loader_return_buffer (loader, buffer, 1);
_dbus_message_loader_return_buffer (loader, buffer);
}
if (!check_loader_results (loader, expected_validity))
@ -536,7 +536,7 @@ dbus_internal_do_not_use_try_message_data (const DBusString *data,
if ((i+1) < len)
_dbus_string_append_byte (buffer,
_dbus_string_get_byte (data, i+1));
_dbus_message_loader_return_buffer (loader, buffer, 1);
_dbus_message_loader_return_buffer (loader, buffer);
}
if (!check_loader_results (loader, expected_validity))
@ -1327,7 +1327,7 @@ _dbus_message_test (const char *test_data_dir)
_dbus_message_loader_get_buffer (loader, &buffer);
_dbus_string_append_byte (buffer, data[i]);
_dbus_message_loader_return_buffer (loader, buffer, 1);
_dbus_message_loader_return_buffer (loader, buffer);
}
/* Write the body data one byte at a time */
@ -1338,7 +1338,7 @@ _dbus_message_test (const char *test_data_dir)
_dbus_message_loader_get_buffer (loader, &buffer);
_dbus_string_append_byte (buffer, data[i]);
_dbus_message_loader_return_buffer (loader, buffer, 1);
_dbus_message_loader_return_buffer (loader, buffer);
}
#ifdef HAVE_UNIX_FD_PASSING

6
dbus/dbus-message.c
View file

@ -3912,12 +3912,10 @@ _dbus_message_loader_get_buffer (DBusMessageLoader *loader,
*
* @param loader the loader.
* @param buffer the buffer.
* @param bytes_read number of bytes that were read into the buffer.
*/
void
_dbus_message_loader_return_buffer (DBusMessageLoader *loader,
DBusString *buffer,
int bytes_read)
DBusString *buffer)
{
_dbus_assert (loader->buffer_outstanding);
_dbus_assert (buffer == &loader->data);
@ -4694,7 +4692,7 @@ dbus_message_demarshal (const char *str,
_dbus_message_loader_get_buffer (loader, &buffer);
_dbus_string_append_len (buffer, str, len);
_dbus_message_loader_return_buffer (loader, buffer, len);
_dbus_message_loader_return_buffer (loader, buffer);
if (!_dbus_message_loader_queue_messages (loader))
goto fail_oom;

15
dbus/dbus-transport-socket.c
View file

@ -748,29 +748,23 @@ do_reading (DBusTransport *transport)
if (bytes_read > 0)
{
int orig_len;
_dbus_message_loader_get_buffer (transport->loader,
&buffer);
orig_len = _dbus_string_get_length (buffer);
if (!_dbus_auth_decode_data (transport->auth,
&socket_transport->encoded_incoming,
buffer))
{
_dbus_verbose ("Out of memory decoding incoming data\n");
_dbus_message_loader_return_buffer (transport->loader,
buffer,
_dbus_string_get_length (buffer) - orig_len);
buffer);
oom = TRUE;
goto out;
}
_dbus_message_loader_return_buffer (transport->loader,
buffer,
_dbus_string_get_length (buffer) - orig_len);
buffer);
_dbus_string_set_length (&socket_transport->encoded_incoming, 0);
_dbus_string_compact (&socket_transport->encoded_incoming, 2048);
@ -789,7 +783,7 @@ do_reading (DBusTransport *transport)
if (!_dbus_message_loader_get_unix_fds(transport->loader, &fds, &n_fds))
{
_dbus_verbose ("Out of memory reading file descriptors\n");
_dbus_message_loader_return_buffer (transport->loader, buffer, 0);
_dbus_message_loader_return_buffer (transport->loader, buffer);
oom = TRUE;
goto out;
}
@ -812,8 +806,7 @@ do_reading (DBusTransport *transport)
}
_dbus_message_loader_return_buffer (transport->loader,
buffer,
bytes_read < 0 ? 0 : bytes_read);
buffer);
}
if (bytes_read < 0)

8
dbus/dbus-transport.c
View file

@ -1045,9 +1045,7 @@ recover_unused_bytes (DBusTransport *transport)
orig_len);
_dbus_message_loader_return_buffer (transport->loader,
buffer,
_dbus_string_get_length (buffer) -
orig_len);
buffer);
_dbus_auth_delete_unused_bytes (transport->auth);
@ -1077,9 +1075,7 @@ recover_unused_bytes (DBusTransport *transport)
orig_len);
_dbus_message_loader_return_buffer (transport->loader,
buffer,
_dbus_string_get_length (buffer) -
orig_len);
buffer);
if (succeeded)
_dbus_auth_delete_unused_bytes (transport->auth);