[Cvs-nserver-commits] CVS: cvs-nserver/src error.c,1.1.1.5,1.1.1.5.4.1

[Alexey M. <ty...@us...>]

Update of /cvsroot/cvs-nserver/cvs-nserver/src
In directory usw-pr-cvs1:/tmp/cvs-serv5099

Modified Files:
      Tag: NCLI-1-11-1
	error.c 
Log Message:
Support %s == NULL;
support %p


Index: error.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/error.c,v
retrieving revision 1.1.1.5
retrieving revision 1.1.1.5.4.1
diff -u -d -r1.1.1.5 -r1.1.1.5.4.1
--- error.c	19 May 2001 12:05:04 -0000	1.1.1.5
+++ error.c	25 May 2002 20:55:25 -0000	1.1.1.5.4.1
@@ -120,6 +120,7 @@
 	const char *p;
 	char *q;
 	char *str;
+	void* ptr;
 	int num;
 	long lnum;
 	unsigned int unum;
@@ -152,6 +153,8 @@
 	    {
 	    case 's':
 		str = va_arg (args, char *);
+		if (!str)
+		    str = "(null)";
 		cvs_outerr (str, strlen (str));
 		break;
 	    case 'd':
@@ -178,6 +181,11 @@
 		unum = va_arg (args, unsigned int);
 		sprintf (buf, "%x", unum);
 		cvs_outerr (buf, strlen (buf));
+		break;
+	    case 'p':
+		ptr = va_arg (args, void*);
+		sprintf (buf, "%p", ptr);
+		cvs_outerr (buf, strlen(buf));
 		break;
 	    case 'c':
 		ch = va_arg (args, int);