CVS commit: src/bin/sh

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Mon Aug 30 06:27:15 UTC 2010

Modified Files:
        src/bin/sh: input.c output.c output.h

Log Message:
dprintf is claimed by posix.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/bin/sh/input.c
cvs rdiff -u -r1.32 -r1.33 src/bin/sh/output.c
cvs rdiff -u -r1.20 -r1.21 src/bin/sh/output.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/bin/sh/input.c
diff -u src/bin/sh/input.c:1.42 src/bin/sh/input.c:1.43
--- src/bin/sh/input.c:1.42	Tue Mar 10 17:21:11 2009
+++ src/bin/sh/input.c	Mon Aug 30 02:27:14 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: input.c,v 1.42 2009/03/10 21:21:11 roy Exp $	*/
+/*	$NetBSD: input.c,v 1.43 2010/08/30 06:27:14 christos Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)input.c	8.3 (Berkeley) 6/9/95";
 #else
-__RCSID("$NetBSD: input.c,v 1.42 2009/03/10 21:21:11 roy Exp $");
+__RCSID("$NetBSD: input.c,v 1.43 2010/08/30 06:27:14 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -338,7 +338,7 @@
 	struct strpush *sp;
 
 	INTOFF;
-/*dprintf("*** calling pushstring: %s, %d\n", s, len);*/
+/*debugprintf("*** calling pushstring: %s, %d\n", s, len);*/
 	if (parsefile->strpush) {
 		sp = ckmalloc(sizeof (struct strpush));
 		sp->prev = parsefile->strpush;
@@ -365,7 +365,7 @@
 	parsenextc = sp->prevstring;
 	parsenleft = sp->prevnleft;
 	parselleft = sp->prevlleft;
-/*dprintf("*** calling popstring: restoring to '%s'\n", parsenextc);*/
+/*debugprintf("*** calling popstring: restoring to '%s'\n", parsenextc);*/
 	if (sp->ap)
 		sp->ap->flag &= ~ALIASINUSE;
 	parsefile->strpush = sp->prev;

Index: src/bin/sh/output.c
diff -u src/bin/sh/output.c:1.32 src/bin/sh/output.c:1.33
--- src/bin/sh/output.c:1.32	Sun Jul 18 21:15:17 2010
+++ src/bin/sh/output.c	Mon Aug 30 02:27:14 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: output.c,v 1.32 2010/07/19 01:15:17 joerg Exp $	*/
+/*	$NetBSD: output.c,v 1.33 2010/08/30 06:27:14 christos Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)output.c	8.2 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: output.c,v 1.32 2010/07/19 01:15:17 joerg Exp $");
+__RCSID("$NetBSD: output.c,v 1.33 2010/08/30 06:27:14 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -264,8 +264,9 @@
 	va_end(ap);
 }
 
+#ifdef DEBUG
 void
-dprintf(const char *fmt, ...)
+debugprintf(const char *fmt, ...)
 {
 	va_list ap;
 
@@ -274,6 +275,7 @@
 	va_end(ap);
 	flushout(out2);
 }
+#endif
 
 void
 fmtstr(char *outbuf, size_t length, const char *fmt, ...)

Index: src/bin/sh/output.h
diff -u src/bin/sh/output.h:1.20 src/bin/sh/output.h:1.21
--- src/bin/sh/output.h:1.20	Fri Oct 31 10:38:42 2008
+++ src/bin/sh/output.h	Mon Aug 30 02:27:14 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: output.h,v 1.20 2008/10/31 14:38:42 christos Exp $	*/
+/*	$NetBSD: output.h,v 1.21 2010/08/30 06:27:14 christos Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -70,8 +70,10 @@
     __attribute__((__format__(__printf__,2,3)));
 void out1fmt(const char *, ...)
     __attribute__((__format__(__printf__,1,2)));
+#ifdef DEBUG
 void dprintf(const char *, ...)
     __attribute__((__format__(__printf__,1,2)));
+#endif
 void fmtstr(char *, size_t, const char *, ...)
     __attribute__((__format__(__printf__,3,4)));
 void doformat(struct output *, const char *, va_list);