From 7996a9606b9ec277f39f9510b51a29d6cbaf2413 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 14 Nov 2017 13:59:12 +0000 Subject: [PATCH 01/13] Remove commented-out printf debugging Printing to stdout would interfere with generating TAP syntax. Signed-off-by: Simon McVittie --- bus/config-parser.c | 14 -------------- bus/desktop-file.c | 21 --------------------- dbus/dbus-sysdeps-win.c | 1 - 3 files changed, 36 deletions(-) diff --git a/bus/config-parser.c b/bus/config-parser.c index be27d38c..8752fdef 100644 --- a/bus/config-parser.c +++ b/bus/config-parser.c @@ -2016,8 +2016,6 @@ bus_config_parser_start_element (BusConfigParser *parser, _DBUS_ASSERT_ERROR_IS_CLEAR (error); - /* printf ("START: %s\n", element_name); */ - t = top_element_type (parser); if (t == ELEMENT_NONE) @@ -2217,8 +2215,6 @@ bus_config_parser_end_element (BusConfigParser *parser, _DBUS_ASSERT_ERROR_IS_CLEAR (error); - /* printf ("END: %s\n", element_name); */ - t = top_element_type (parser); if (t == ELEMENT_NONE) @@ -2566,16 +2562,6 @@ bus_config_parser_content (BusConfigParser *parser, _DBUS_ASSERT_ERROR_IS_CLEAR (error); -#if 0 - { - const char *c_str; - - _dbus_string_get_const_data (content, &c_str); - - printf ("CONTENT %d bytes: %s\n", _dbus_string_get_length (content), c_str); - } -#endif - e = peek_element (parser); if (e == NULL) { diff --git a/bus/desktop-file.c b/bus/desktop-file.c index 44598584..c824d566 100644 --- a/bus/desktop-file.c +++ b/bus/desktop-file.c @@ -598,27 +598,6 @@ report_error (BusDesktopFileParser *parser, "Error at line %d: %s\n", parser->line_num, message); } -#if 0 -static void -dump_desktop_file (BusDesktopFile *file) -{ - int i; - - for (i = 0; i < file->n_sections; i++) - { - int j; - - printf ("[%s]\n", file->sections[i].section_name); - - for (j = 0; j < file->sections[i].n_lines; j++) - { - printf ("%s=%s\n", file->sections[i].lines[j].key, - file->sections[i].lines[j].value); - } - } -} -#endif - BusDesktopFile* bus_desktop_file_load (DBusString *filename, DBusError *error) diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c index 74a95018..980b431e 100644 --- a/dbus/dbus-sysdeps-win.c +++ b/dbus/dbus-sysdeps-win.c @@ -3099,7 +3099,6 @@ _dbus_get_autolaunch_address (const char *scope, DBusString *address, _snprintf(dbus_args, sizeof(dbus_args) - 1, "\"%s\" %s", dbus_exe_path, " --session"); // argv[i] = "--config-file=bus\\session.conf"; -// printf("create process \"%s\" %s\n", dbus_exe_path, dbus_args); if(CreateProcessA(dbus_exe_path, dbus_args, NULL, NULL, FALSE, CREATE_NO_WINDOW, NULL, NULL, &si, &pi)) { CloseHandle (pi.hThread); -- 2.15.0