[src/trunk]: src/sys/arch/hpcmips/stand/libsa rename printf.c to winprintf.c, ...

[cgd <cgd%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d2d099752c3b
branches:  trunk
changeset: 481685:d2d099752c3b
user:      cgd <cgd%NetBSD.org@localhost>
date:      Thu Feb 03 19:46:21 2000 +0000

description:
rename printf.c to winprintf.c, nuke inclusion of libsa's printf.c
in winprintf.c, and directly include libsa's printf.c in the project.

diffstat:

 sys/arch/hpcmips/stand/libsa/libsa.config |   5 +-
 sys/arch/hpcmips/stand/libsa/libsa.dsp    |  12 +++-
 sys/arch/hpcmips/stand/libsa/printf.c     |  69 -------------------------------
 sys/arch/hpcmips/stand/libsa/winprintf.c  |  66 +++++++++++++++++++++++++++++
 4 files changed, 77 insertions(+), 75 deletions(-)

diffs (205 lines):

diff -r 318d87d5f7ac -r d2d099752c3b sys/arch/hpcmips/stand/libsa/libsa.config
--- a/sys/arch/hpcmips/stand/libsa/libsa.config Thu Feb 03 19:32:37 2000 +0000
+++ b/sys/arch/hpcmips/stand/libsa/libsa.config Thu Feb 03 19:46:21 2000 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: libsa.config,v 1.5 2000/02/03 19:32:42 cgd Exp $
+# $NetBSD: libsa.config,v 1.6 2000/02/03 19:46:21 cgd Exp $
 
 # config file/script to generate project file (.dsp) for libsa
 
@@ -13,15 +13,16 @@
        ../../../../lib/libsa/dkcksum.c
        ../../../../lib/libsa/lseek.c
        ../../../../lib/libsa/open.c
+       ../../../../lib/libsa/printf.c
        ../../../../lib/libsa/read.c
        ../../../../lib/libsa/subr_prf.c
        ../../../../lib/libsa/twiddle.c
        ../../../../lib/libsa/ufs.c
        alloc.c
        devopen.c
-       printf.c
        winblk.c
        winfs.c
+       winprintf.c
 '
 CPPDEF_LIST='
        _STANDALONE
diff -r 318d87d5f7ac -r d2d099752c3b sys/arch/hpcmips/stand/libsa/libsa.dsp
--- a/sys/arch/hpcmips/stand/libsa/libsa.dsp    Thu Feb 03 19:32:37 2000 +0000
+++ b/sys/arch/hpcmips/stand/libsa/libsa.dsp    Thu Feb 03 19:46:21 2000 +0000
@@ -104,6 +104,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=.\../../../../lib/libsa/printf.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\../../../../lib/libsa/read.c
 # End Source File
 # Begin Source File
@@ -128,15 +132,15 @@
 # End Source File
 # Begin Source File
 
-SOURCE=.\printf.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\winblk.c
 # End Source File
 # Begin Source File
 
 SOURCE=.\winfs.c
 # End Source File
+# Begin Source File
+
+SOURCE=.\winprintf.c
+# End Source File
 # End Target
 # End Project
diff -r 318d87d5f7ac -r d2d099752c3b sys/arch/hpcmips/stand/libsa/printf.c
--- a/sys/arch/hpcmips/stand/libsa/printf.c     Thu Feb 03 19:32:37 2000 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-/*     $NetBSD: printf.c,v 1.3 2000/02/03 03:21:54 cgd Exp $   */
-
-/*-
- * Copyright (c) 1999 Shin Takemura.
- * All rights reserved.
- *
- * This software is part of the PocketBSD.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the PocketBSD project
- *     and its contributors.
- * 4. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-#include <windows.h>
-#include <tchar.h>
-#include <stdarg.h>
-
-#include "../../../../lib/libsa/printf.c"
-
-
-int 
-win_printf(LPWSTR lpszFmt, ...)
-{
-       int count;
-       va_list ap;
-       wchar_t buffer[2048];
-
-       va_start(ap, lpszFmt);
-       count = wvsprintf(buffer, lpszFmt, ap);
-       va_end(ap);
-       if (count > 0) {
-               OutputDebugStringW(buffer);
-       }
-       return count;
-}
-
-
-/*
- *  printf() uses this.
- */
-void
-putchar(int c)
-{
-  win_printf(TEXT("%C"), c);
-}
diff -r 318d87d5f7ac -r d2d099752c3b sys/arch/hpcmips/stand/libsa/winprintf.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/hpcmips/stand/libsa/winprintf.c  Thu Feb 03 19:46:21 2000 +0000
@@ -0,0 +1,66 @@
+/*     $NetBSD: winprintf.c,v 1.1 2000/02/03 19:46:22 cgd Exp $        */
+
+/*-
+ * Copyright (c) 1999 Shin Takemura.
+ * All rights reserved.
+ *
+ * This software is part of the PocketBSD.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the PocketBSD project
+ *     and its contributors.
+ * 4. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ */
+#include <windows.h>
+#include <tchar.h>
+#include <stdarg.h>
+
+int 
+win_printf(LPWSTR lpszFmt, ...)
+{
+       int count;
+       va_list ap;
+       wchar_t buffer[2048];
+
+       va_start(ap, lpszFmt);
+       count = wvsprintf(buffer, lpszFmt, ap);
+       va_end(ap);
+       if (count > 0) {
+               OutputDebugStringW(buffer);
+       }
+       return count;
+}
+
+
+/*
+ *  printf() uses this.
+ */
+void
+putchar(int c)
+{
+  win_printf(TEXT("%C"), c);
+}