Remove spaces before '\n's.

Francois Gouget fgouget at free.fr
Sun Mar 8 17:48:03 CDT 2009


---
 dlls/comcat/tests/comcat.c    |    2 +-
 dlls/comctl32/tests/rebar.c   |    2 +-
 dlls/comctl32/tests/toolbar.c |    2 +-
 dlls/dmloader/container.c     |    2 +-
 dlls/dmloader/loader.c        |    6 +++---
 dlls/msvcrt/scanf.h           |    2 +-
 dlls/ntdll/serial.c           |    2 +-
 dlls/riched20/tests/editor.c  |    6 +++---
 dlls/rsaenh/tests/rsaenh.c    |    2 +-
 dlls/setupapi/tests/parser.c  |    8 ++++----
 dlls/snmpapi/tests/util.c     |   14 +++++++-------
 dlls/winedos/interrupts.c     |    4 ++--
 programs/expand/expand.c      |    2 +-
 programs/winedbg/break.c      |    2 +-
 programs/winedbg/types.c      |    2 +-
 tools/winedump/output.c       |    2 +-
 tools/winedump/pdb.c          |    4 ++--
 17 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/dlls/comcat/tests/comcat.c b/dlls/comcat/tests/comcat.c
index 49e5afe..029d2e3 100644
--- a/dlls/comcat/tests/comcat.c
+++ b/dlls/comcat/tests/comcat.c
@@ -29,7 +29,7 @@
 
 #include "wine/test.h"
 
-#define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x \n", hr)
+#define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr)
 
 static BOOL register_testentry(void)
 {
diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c
index 933d515..d055d8a 100644
--- a/dlls/comctl32/tests/rebar.c
+++ b/dlls/comctl32/tests/rebar.c
@@ -157,7 +157,7 @@ static void dump_sizes(HWND hRebar)
         printf("%s{ {%3d, %3d, %3d, %3d}, 0x%02x, %d}, ", (i%2==0 ? "\n    " : ""), r.left, r.top, r.right, r.bottom,
             rbi.fStyle, rbi.cx);
     }
-    printf("\n  }, }, \n");
+    printf("\n  }, },\n");
 }
 
 #define check_sizes() dump_sizes(hRebar);
diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c
index 02601cf..0c560b1 100644
--- a/dlls/comctl32/tests/toolbar.c
+++ b/dlls/comctl32/tests/toolbar.c
@@ -592,7 +592,7 @@ static void dump_sizes(HWND hToolbar)
         SendMessageA(hToolbar, TB_GETITEMRECT, i, &r);
         printf("%s{%3d, %3d, %3d, %3d}, ", (i%3==0 ? "\n    " : ""), r.left, r.top, r.right, r.bottom);
     }
-    printf("\n  }, }, \n");
+    printf("\n  }, },\n");
 }
 
 #define check_sizes() dump_sizes(hToolbar);
diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c
index 3cd166e..a1fa878 100644
--- a/dlls/dmloader/container.c
+++ b/dlls/dmloader/container.c
@@ -641,7 +641,7 @@ static HRESULT WINAPI IDirectMusicContainerImpl_IPersistStream_Load (LPPERSISTST
 																		DMUS_IO_CONTAINED_OBJECT_HEADER tmpObjectHeader;
 																		TRACE_(dmfile)(": contained object header chunk\n");
 																		IStream_Read (pStm, &tmpObjectHeader, Chunk.dwSize, NULL);
-																		TRACE_(dmdump)(": contained object header: \n%s\n", debugstr_DMUS_IO_CONTAINED_OBJECT_HEADER(&tmpObjectHeader));
+																		TRACE_(dmdump)(": contained object header:\n%s\n", debugstr_DMUS_IO_CONTAINED_OBJECT_HEADER(&tmpObjectHeader));
 																		/* copy guidClass */
 																		pNewEntry->Desc.dwValidData |= DMUS_OBJ_CLASS;
 																		pNewEntry->Desc.guidClass = tmpObjectHeader.guidClassID;
diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c
index 8a31b62..17a8eb2 100644
--- a/dlls/dmloader/loader.c
+++ b/dlls/dmloader/loader.c
@@ -26,7 +26,7 @@ static HRESULT DMUSIC_GetLoaderSettings (LPDIRECTMUSICLOADER8 iface, REFGUID pCl
 static HRESULT DMUSIC_SetLoaderSettings (LPDIRECTMUSICLOADER8 iface, REFGUID pClassID, WCHAR* wszSearchPath, LPBOOL pbCache);
 
 static HRESULT DMUSIC_CopyDescriptor (LPDMUS_OBJECTDESC pDst, LPDMUS_OBJECTDESC pSrc) {
-	TRACE(": copy \n%s\n", debugstr_DMUS_OBJECTDESC(pSrc));
+	TRACE(": copy\n%s\n", debugstr_DMUS_OBJECTDESC(pSrc));
 	/* copy field by field */
 	if (pSrc->dwValidData & DMUS_OBJ_CLASS) pDst->guidClass = pSrc->guidClass;
 	if (pSrc->dwValidData & DMUS_OBJ_OBJECT) pDst->guidObject = pSrc->guidObject;
@@ -482,7 +482,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_SetObject (LPDIR
 	}		
 	
 	/* add new entry */
-	TRACE(": adding alias entry with following info: \n%s\n", debugstr_DMUS_OBJECTDESC(pDesc));
+	TRACE(": adding alias entry with following info:\n%s\n", debugstr_DMUS_OBJECTDESC(pDesc));
 	pNewEntry = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(WINE_LOADER_ENTRY));
 	/* use this function instead of pure memcpy due to streams (memcpy just copies pointer), 
 	   which is basically used further by app that called SetDescriptor... better safety than exception */
@@ -694,7 +694,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_ReleaseObject (L
 		}
 	}
 	if (result == S_OK) {
-		/*TRACE(": releasing: \n%s  - bInvalidDefaultDLS = %i\n  - pObject = %p\n", debugstr_DMUS_OBJECTDESC(&pObjectEntry->Desc), pObjectEntry->bInvalidDefaultDLS, pObjectEntry->pObject); */
+		/*TRACE(": releasing:\n%s  - bInvalidDefaultDLS = %i\n  - pObject = %p\n", debugstr_DMUS_OBJECTDESC(&pObjectEntry->Desc), pObjectEntry->bInvalidDefaultDLS, pObjectEntry->pObject); */
 		IDirectMusicObject_Release (pObjectEntry->pObject);
 		pObjectEntry->pObject = NULL;
 		pObjectEntry->Desc.dwValidData &= ~DMUS_OBJ_LOADED;
diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h
index fd1ad3b..6ea9ab1 100644
--- a/dlls/msvcrt/scanf.h
+++ b/dlls/msvcrt/scanf.h
@@ -79,7 +79,7 @@ _FUNCTION_ {
     if (!*format) return 0;
 #ifndef WIDE_SCANF
 #ifdef CONSOLE
-    TRACE("(%s): \n", debugstr_a(format));
+    TRACE("(%s):\n", debugstr_a(format));
 #else /* CONSOLE */
 #ifdef STRING
     TRACE("%s (%s)\n", file, debugstr_a(format));
diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c
index c8d3b29..48457c8 100644
--- a/dlls/ntdll/serial.c
+++ b/dlls/ntdll/serial.c
@@ -486,7 +486,7 @@ static NTSTATUS set_baud_rate(int fd, const SERIAL_BAUD_RATE* sbr)
                  "a non-standard baud rate %d.  Wine will set the rate to %d,\n"
                  "which is as close as we can get by our present understanding of your\n"
                  "hardware. I hope you know what you are doing.  Any disruption Wine\n"
-                 "has caused to your linux system can be undone with setserial \n"
+                 "has caused to your linux system can be undone with setserial\n"
                  "(see man setserial). If you have incapacitated a Hayes type modem,\n"
                  "reset it and it will probably recover.\n", sbr->BaudRate, arby);
             ioctl(fd, TIOCSSERIAL, &nuts);
diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c
index f8da3fa..331fd69 100644
--- a/dlls/riched20/tests/editor.c
+++ b/dlls/riched20/tests/editor.c
@@ -3282,7 +3282,7 @@ static void test_WM_SETTEXT(void)
   memset(buf, 0, sizeof(buf));
   SendMessage(hwndRichEdit, EM_STREAMOUT,
               (WPARAM)(SF_RTF), (LPARAM)&es);
-  trace("EM_STREAMOUT produced: \n%s\n", buf);
+  trace("EM_STREAMOUT produced:\n%s\n", buf);
   TEST_SETTEXT(buf, TestItem1)
 
 #undef TEST_SETTEXT
@@ -3618,7 +3618,7 @@ static void test_EM_SETTEXTEX(void)
   memset(buf, 0, sizeof(buf));
   SendMessage(hwndRichEdit, EM_STREAMOUT,
               (WPARAM)(SF_RTF), (LPARAM)&es);
-  trace("EM_STREAMOUT produced: \n%s\n", (char *)buf);
+  trace("EM_STREAMOUT produced:\n%s\n", (char *)buf);
 
   /* !ST_SELECTION && !Unicode && \rtf */
   setText.codepage = CP_ACP;/* EM_STREAMOUT saved as ANSI string */
@@ -3659,7 +3659,7 @@ static void test_EM_SETTEXTEX(void)
   memset(buf, 0, sizeof(buf));
   SendMessage(hwndRichEdit, EM_STREAMOUT,
               (WPARAM)(SF_RTF), (LPARAM)&es);
-  trace("EM_STREAMOUT produced: \n%s\n", (char *)buf);
+  trace("EM_STREAMOUT produced:\n%s\n", (char *)buf);
 
   /* select some text */
   cr.cpMax = 1;
diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c
index 8e12b2a..8afa931 100644
--- a/dlls/rsaenh/tests/rsaenh.c
+++ b/dlls/rsaenh/tests/rsaenh.c
@@ -106,7 +106,7 @@ static void trace_hex(BYTE *pbData, DWORD dwLen) {
         trace(szTemp);
     }
     for (j=0; i<dwLen; j++,i++) {
-        sprintf(szTemp+6*j, "0x%02x, \n", pbData[i]);
+        sprintf(szTemp+6*j, "0x%02x,\n", pbData[i]);
     }
     trace(szTemp);
 }
diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c
index 0aa78c1..91a8425 100644
--- a/dlls/setupapi/tests/parser.c
+++ b/dlls/setupapi/tests/parser.c
@@ -126,10 +126,10 @@ static const struct
     { ";\n;\nabc\r\n" STD_HEADER,                            ERROR_EXPECTED_SECTION_NAME, 3,    0 },
     { ";\n;\nab\nab\n" STD_HEADER,                           ERROR_EXPECTED_SECTION_NAME, 3,    0 },
     { ";aa\n;bb\n" STD_HEADER,                               0,                           0,    0 },
-    { STD_HEADER " [TestSection\x00] \n",                    ERROR_BAD_SECTION_NAME_LINE, 3,    0 },
-    { STD_HEADER " [Test\x00Section] \n",                    ERROR_BAD_SECTION_NAME_LINE, 3,    0 },
-    { STD_HEADER " [TestSection\x00] \n",                    ERROR_BAD_SECTION_NAME_LINE, 3,    0 },
-    { STD_HEADER " [Test\x00Section] \n",                    ERROR_BAD_SECTION_NAME_LINE, 3,    0 },
+    { STD_HEADER " [TestSection\x00]\n",                     ERROR_BAD_SECTION_NAME_LINE, 3,    0 },
+    { STD_HEADER " [Test\x00Section]\n",                     ERROR_BAD_SECTION_NAME_LINE, 3,    0 },
+    { STD_HEADER " [TestSection\x00]\n",                     ERROR_BAD_SECTION_NAME_LINE, 3,    0 },
+    { STD_HEADER " [Test\x00Section]\n",                     ERROR_BAD_SECTION_NAME_LINE, 3,    0 },
 };
 
 static void test_invalid_files(void)
diff --git a/dlls/snmpapi/tests/util.c b/dlls/snmpapi/tests/util.c
index 7973917..64c7501 100644
--- a/dlls/snmpapi/tests/util.c
+++ b/dlls/snmpapi/tests/util.c
@@ -107,7 +107,7 @@ static void test_SnmpUtilOidToA(void)
     {
         ret = SnmpUtilOidToA(NULL);
         ok(ret != NULL, "SnmpUtilOidToA failed\n");
-        ok(!strcmp(ret, expect0), "SnmpUtilOidToA failed got \n%s\n expected \n%s\n",
+        ok(!strcmp(ret, expect0), "SnmpUtilOidToA failed got\n%s\n expected\n%s\n",
            ret, expect1);
     }
 
@@ -115,34 +115,34 @@ static void test_SnmpUtilOidToA(void)
     ok(ret != NULL, "SnmpUtilOidToA failed\n");
     ok(!strcmp(ret, expect0) ||
        broken(!strcmp(ret, expect0_alt)), /* Win98, WinMe, NT4 */
-       "SnmpUtilOidToA failed got \n%s\n expected \n%s\n",
+       "SnmpUtilOidToA failed got\n%s\n expected\n%s\n",
        ret, expect0);
 
     ret = SnmpUtilOidToA(&oid1);
     ok(ret != NULL, "SnmpUtilOidToA failed\n");
-    ok(!strcmp(ret, expect1), "SnmpUtilOidToA failed got \n%s\n expected \n%s\n",
+    ok(!strcmp(ret, expect1), "SnmpUtilOidToA failed got\n%s\n expected\n%s\n",
        ret, expect1);
 
     ret = SnmpUtilOidToA(&oid2);
     ok(ret != NULL, "SnmpUtilOidToA failed\n");
-    ok(!strcmp(ret, expect2), "SnmpUtilOidToA failed got \n%s\n expected \n%s\n",
+    ok(!strcmp(ret, expect2), "SnmpUtilOidToA failed got\n%s\n expected\n%s\n",
        ret, expect2);
 
     ret = SnmpUtilOidToA(&oid3);
     ok(ret != NULL, "SnmpUtilOidToA failed\n");
-    ok(!strcmp(ret, expect3), "SnmpUtilOidToA failed got \n%s\n expected \n%s\n",
+    ok(!strcmp(ret, expect3), "SnmpUtilOidToA failed got\n%s\n expected\n%s\n",
        ret, expect3);
 
     ret = SnmpUtilOidToA(&oid4);
     ok(ret != NULL, "SnmpUtilOidToA failed\n");
     ok(!strcmp(ret, expect3) ||
        broken(!strcmp(ret, expect3_alt)), /* Win98, WinMe, NT4 */
-       "SnmpUtilOidToA failed got \n%s\n expected \n%s\n",
+       "SnmpUtilOidToA failed got\n%s\n expected\n%s\n",
        ret, expect3);
 
     ret = SnmpUtilOidToA(&oid5);
     ok(ret != NULL, "SnmpUtilOidToA failed\n");
-    ok(!strcmp(ret, expect4), "SnmpUtilOidToA failed got \n%s\n expected \n%s\n",
+    ok(!strcmp(ret, expect4), "SnmpUtilOidToA failed got\n%s\n expected\n%s\n",
        ret, expect4);
 }
 
diff --git a/dlls/winedos/interrupts.c b/dlls/winedos/interrupts.c
index 580bee9..db0f17e 100644
--- a/dlls/winedos/interrupts.c
+++ b/dlls/winedos/interrupts.c
@@ -262,7 +262,7 @@ BOOL WINAPI DOSVM_EmulateInterruptPM( CONTEXT86 *context, BYTE intnum )
 {
     TRACE_(relay)("Call DOS int 0x%02x ret=%04x:%08x\n"
                   "  eax=%08x ebx=%08x ecx=%08x edx=%08x\n"
-                  "  esi=%08x edi=%08x ebp=%08x esp=%08x \n"
+                  "  esi=%08x edi=%08x ebp=%08x esp=%08x\n"
                   "  ds=%04x es=%04x fs=%04x gs=%04x ss=%04x flags=%08x\n",
                   intnum, context->SegCs, context->Eip,
                   context->Eax, context->Ebx, context->Ecx, context->Edx,
@@ -449,7 +449,7 @@ BOOL WINAPI DOSVM_EmulateInterruptRM( CONTEXT86 *context, BYTE intnum )
 {
     TRACE_(relay)("Call DOS int 0x%02x ret=%04x:%08x\n"
                   "  eax=%08x ebx=%08x ecx=%08x edx=%08x\n"
-                  "  esi=%08x edi=%08x ebp=%08x esp=%08x \n"
+                  "  esi=%08x edi=%08x ebp=%08x esp=%08x\n"
                   "  ds=%04x es=%04x fs=%04x gs=%04x ss=%04x flags=%08x\n",
                   intnum, context->SegCs, context->Eip,
                   context->Eax, context->Ebx, context->Ecx, context->Edx,
diff --git a/programs/expand/expand.c b/programs/expand/expand.c
index 1118f08..9c78f96 100644
--- a/programs/expand/expand.c
+++ b/programs/expand/expand.c
@@ -85,7 +85,7 @@ int main(int argc, char *argv[])
     {
         fprintf( stderr, "Usage:\n" );
         fprintf( stderr, "\t%s infile outfile\n", argv[0] );
-        fprintf( stderr, "\t%s /r infile \n", argv[0] );
+        fprintf( stderr, "\t%s /r infile\n", argv[0] );
         return 1;
     }
 
diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c
index be6e6c5..ddb75a2 100644
--- a/programs/winedbg/break.c
+++ b/programs/winedbg/break.c
@@ -918,7 +918,7 @@ void break_restart_execution(int count)
     if (mode == dbg_exec_step_into_line && 
         symbol_get_function_line_status(&addr) == dbg_no_line_info)
     {
-        dbg_printf("Single stepping until exit from function, \n"
+        dbg_printf("Single stepping until exit from function,\n"
                    "which has no line number information.\n");
         ret_mode = mode = dbg_exec_finish;
     }
diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c
index 9f19b63..ef5469f 100644
--- a/programs/winedbg/types.c
+++ b/programs/winedbg/types.c
@@ -562,7 +562,7 @@ static BOOL CALLBACK print_types_cb(PSYMBOL_INFO sym, ULONG size, void* ctx)
     struct dbg_type     type;
     type.module = sym->ModBase;
     type.id = sym->TypeIndex;
-    dbg_printf("Mod: %08x ID: %08lx \n", type.module, type.id);
+    dbg_printf("Mod: %08x ID: %08lx\n", type.module, type.id);
     types_print_type(&type, TRUE);
     dbg_printf("\n");
     return TRUE;
diff --git a/tools/winedump/output.c b/tools/winedump/output.c
index 66c5e4d..2b9d1ae 100644
--- a/tools/winedump/output.c
+++ b/tools/winedump/output.c
@@ -148,7 +148,7 @@ void  output_header_preamble (void)
 
   fprintf (hfile,
            "/*\n * %s.dll\n *\n * Generated from %s.dll by winedump.\n *\n"
-           " * DO NOT SEND GENERATED DLLS FOR INCLUSION INTO WINE !\n * \n */"
+           " * DO NOT SEND GENERATED DLLS FOR INCLUSION INTO WINE !\n *\n */"
            "\n#ifndef __WINE_%s_DLL_H\n#define __WINE_%s_DLL_H\n\n"
            "#include \"windef.h\"\n#include \"wine/debug.h\"\n"
            "#include \"winbase.h\"\n#include \"winnt.h\"\n\n\n",
diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c
index 3641ff6..4217113 100644
--- a/tools/winedump/pdb.c
+++ b/tools/winedump/pdb.c
@@ -334,7 +334,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader)
             lineno_size = sym_file->lineno_size;
             printf("\t--------symbol file----------- %s\n", file_name);
             printf("\tgot symbol_file\n"
-                   "\t\tunknown1:   %08x \n"
+                   "\t\tunknown1:   %08x\n"
                    "\t\trange\n"
                    "\t\t\tsegment:         %04x\n"
                    "\t\t\tpad1:            %04x\n"
@@ -374,7 +374,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader)
             symbol_size = sym_file->symbol_size;
             lineno_size = sym_file->lineno_size;
             printf("\t--------symbol file----------- %s\n", file_name);
-            printf("\t\tunknown1:   %08x \n"
+            printf("\t\tunknown1:   %08x\n"
                    "\t\trange\n"
                    "\t\t\tsegment:         %04x\n"
                    "\t\t\tpad1:            %04x\n"
-- 
1.6.1.3




More information about the wine-patches mailing list