X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fsysdep.c;h=9dce3a3ae0a94c973a897e31407417fcdb1a8c53;hb=24ea4a1892e55b393ba75add798c7e9e3fd64cbc;hp=963af9df6aa84e3d081182cb9d954e51136d93f6;hpb=f4fb5e846c1fdf2016dd2d39b82e4bc11e73d022;p=citadel.git

diff --git a/citadel/sysdep.c b/citadel/sysdep.c
index 963af9df6..9dce3a3ae 100644
--- a/citadel/sysdep.c
+++ b/citadel/sysdep.c
@@ -120,78 +120,47 @@ void vCtdlLogPrintf(enum LogLevel loglevel, const char *format, va_list arg_ptr)
 		struct timeval tv;
 		struct tm tim;
 		time_t unixtime;
-		StrBuf *lBuf;
 		CitContext *CCC = CC;
 		ThreadTSD *cTSD = CTP;
 		CtdlThreadNode *node = NULL;
 		long lwpid = 0;
 
-		if (cTSD != NULL) 
+		if (cTSD != NULL) {
 			node = cTSD->self;
-		if ((node != NULL) && (node->reltid != 0))
-		{
+		}
+
+		if ((node != NULL) && (node->reltid != 0)) {
 			lwpid = node->reltid;
 		}
 
 		gettimeofday(&tv, NULL);
+
 		/* Promote to time_t; types differ on some OSes (like darwin) */
 		unixtime = tv.tv_sec;
 		localtime_r(&unixtime, &tim);
 
-		if ((CCC != NULL) && (CCC != &masterCC))
-			lBuf = CCC->lBuf;
-		else 
-			lBuf = NewStrBuf();
-		if (lBuf == NULL) {
-			char buf[SIZ], buf2[SIZ];
-			
-			if ((CCC != NULL) && (CCC->cs_pid != 0)) {
-				sprintf(buf,
-					"%04d/%02d/%02d %2d:%02d:%02d.%06ld xx [%3d] ",
-					tim.tm_year + 1900, tim.tm_mon + 1,
-					tim.tm_mday, tim.tm_hour, tim.tm_min,
-					tim.tm_sec, (long)tv.tv_usec,
-					CCC->cs_pid);
-			} else {
-				sprintf(buf,
-					"%04d/%02d/%02d %2d:%02d:%02d.%06ld xx ",
-					tim.tm_year + 1900, tim.tm_mon + 1,
-					tim.tm_mday, tim.tm_hour, tim.tm_min,
-					tim.tm_sec, (long)tv.tv_usec);
-			}
-			vsnprintf(buf2, SIZ, format, arg_ptr);   
+		fprintf(stderr,
+			"%04d/%02d/%02d %2d:%02d:%02d.%06ld ",
+			tim.tm_year + 1900, tim.tm_mon + 1,
+			tim.tm_mday, tim.tm_hour, tim.tm_min,
+			tim.tm_sec, (long)tv.tv_usec
+		);
 
-			fprintf(stderr, ":%s%s", buf, buf2);
+		if (lwpid != 0) {
+			fprintf(stderr, "[LWP:%ld] ", lwpid);
 		}
-		else {
-			StrBufPrintf(lBuf,
-				     "%04d/%02d/%02d %2d:%02d:%02d.%06ld ",
-				     tim.tm_year + 1900, tim.tm_mon + 1,
-				     tim.tm_mday, tim.tm_hour, tim.tm_min,
-				     tim.tm_sec, (long)tv.tv_usec);
-
 			
-			if (lwpid != 0)
-				StrBufAppendPrintf(lBuf,
-						   "[LWP:%d] ",
-						   lwpid);
-				
-			if (CCC != NULL) {
-				if (CCC->cs_pid != 0)
-					StrBufAppendPrintf(lBuf,
-							   "[%3d] ",
-							   CCC->cs_pid);
-				else if (CCC->user.usernum != 0)
-					StrBufAppendPrintf(lBuf,
-							   "[:%d] ",
-							   CCC->user.usernum);
+		if (CCC != NULL) {
+			if (CCC->cs_pid != 0) {
+				fprintf(stderr, "[%3d] ", CCC->cs_pid);
+			}
+			else if (CCC->user.usernum != 0) {
+				fprintf(stderr, "[:%ld] ", CCC->user.usernum);
 			}
-			StrBufVAppendPrintf(lBuf, format, arg_ptr);   
-			fwrite(ChrPtr(lBuf), 1, StrLength(lBuf), stderr);
 		}
-		fflush(stderr);
-		if (CCC == NULL) FreeStrBuf(&lBuf);
 
+		vfprintf(stderr, format, arg_ptr);   
+		fflush(stderr);
 	}
 }