2004-10-04 Casper S. Hornstrup <chorns@users.sourceforge.net>

	* tools/helper.mk: Clean autogenerated files.
	* tools/regtests.c: Remove newlines.

svn path=/trunk/; revision=11189

diff --git a/reactos/ChangeLog b/reactos/ChangeLog
index b15df4f..f640e68 100644 (file)
--- a/reactos/ChangeLog
+++ b/reactos/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-04  Casper S. Hornstrup  <chorns@users.sourceforge.net>
+
+       * tools/helper.mk: Clean autogenerated files.
+       * tools/regtests.c: Remove newlines.
+
 2004-10-02  Casper S. Hornstrup  <chorns@users.sourceforge.net>
 
        * lib/gdiplus/tests/.cvsignore: Ignore _hooks.c and _stubs.S.

diff --git a/reactos/tools/helper.mk b/reactos/tools/helper.mk
index 7c9bf08..30ad54c 100644 (file)
--- a/reactos/tools/helper.mk
+++ b/reactos/tools/helper.mk
@@ -1,4 +1,4 @@
-# $Id: helper.mk,v 1.84 2004/10/04 10:16:59 chorns Exp $
+# $Id: helper.mk,v 1.85 2004/10/04 19:41:28 chorns Exp $
 #
 # Helper makefile for ReactOS modules
 # Variables this makefile accepts:
@@ -996,7 +996,7 @@ endif
 
 clean_regtests:
        $(MAKE) -C tests TARGET_REGTESTS=no clean
-       $(RM) ./tests/_rtstub.c ./tests/_regtests.c ./tests/Makefile.tests
+       $(RM) ./tests/_rtstub.c ./tests/_regtests.c ./tests/_hooks.c ./tests/_stubs.S ./tests/Makefile.tests
 
 .PHONY: all depends implib clean install dist bootcd depends gen_regtests clean_regtests
 

diff --git a/reactos/tools/regtests.c b/reactos/tools/regtests.c
index 1a56c1d..5a70d38 100755 (executable)
--- a/reactos/tools/regtests.c
+++ b/reactos/tools/regtests.c
@@ -694,9 +694,16 @@ create_stubs_and_hooks(
                /* Next stub index */
          stub_index++)
        {
+               /*
+                * Remove, if present, the trailing LF.
+                */
+               if ((s = (char *) strchr(line,'\n')) != NULL)
+                 {
+                         *s = '\0';
+           }
+
                /*
                 * Remove, if present, the trailing CR.
-                * (os specific?)
                 */
                if ((s = (char *) strchr(line,'\r')) != NULL)
                  {