From 2cdf6103d6c6957c791da3d87fbd48b9eca0ec6b Mon Sep 17 00:00:00 2001
From: Nathan Neulinger <nneul@umr.edu>
Date: Tue, 3 Apr 2001 21:19:34 +0000
Subject: [PATCH] prefer-ubik-print-to-printf-20010403

changes to prefer ubik_print &c to printf to make syslogging easier
---
 src/ubik/beacon.c    |  5 ++---
 src/ubik/lock.c      |  2 +-
 src/ubik/remote.c    | 16 +++++++---------
 src/ubik/ubik.c      |  6 +++---
 src/util/serverLog.c |  8 ++++++--
 5 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/ubik/beacon.c b/src/ubik/beacon.c
index bb11cbdf9..fe8ac9ec3 100644
--- a/src/ubik/beacon.c
+++ b/src/ubik/beacon.c
@@ -615,9 +615,8 @@ afs_uint32 ubik_host[UBIK_MAX_INTERFACE_ADDR];
 		code = UBADHOST; /* remote CellServDB inconsistency */
 		ubik_print("Inconsistent Cell Info on server: ");
 		for ( j=0; j < UBIK_MAX_INTERFACE_ADDR && ts->addr[j]; j++)
-		    printf("%s ", afs_inet_ntoa(ts->addr[j]));
-		printf("\n");
-		fflush(stdout); fflush(stderr);     
+		    ubik_print("%s ", afs_inet_ntoa(ts->addr[j]));
+		ubik_print("\n");
 	    }
 	    else {
 		ts->up= 0;	/* mark the remote server as down */
diff --git a/src/ubik/lock.c b/src/ubik/lock.c
index c7773a413..a81150cee 100644
--- a/src/ubik/lock.c
+++ b/src/ubik/lock.c
@@ -74,7 +74,7 @@ ulock_getLock(atrans, atype, await)
      return UDONE;
 
   if (atrans->locktype != 0) {
-     printf("Ubik: Internal Error: attempted to take lock twice\n");
+     ubik_print("Ubik: Internal Error: attempted to take lock twice\n");
      abort();
   }
 
diff --git a/src/ubik/remote.c b/src/ubik/remote.c
index eeb102022..4ed4dc8fa 100644
--- a/src/ubik/remote.c
+++ b/src/ubik/remote.c
@@ -592,8 +592,8 @@ UbikInterfaceAddr	*inAddr, *outAddr;
     {
 	ubik_print("Inconsistent Cell Info from server: ");
 	for ( i=0; i < UBIK_MAX_INTERFACE_ADDR && inAddr->hostAddr[i]; i++)
-	    printf("%s ", afs_inet_ntoa(htonl(inAddr->hostAddr[i])));
-	printf("\n");
+	    ubik_print("%s ", afs_inet_ntoa(htonl(inAddr->hostAddr[i])));
+	ubik_print("\n");
 	printServerInfo();
         return UBADHOST;
     }
@@ -604,9 +604,8 @@ UbikInterfaceAddr	*inAddr, *outAddr;
     
     ubik_print("ubik: A Remote Server has addresses: ");
     for ( i=0; i < UBIK_MAX_INTERFACE_ADDR && ts->addr[i]; i++)
-	printf("%s ", afs_inet_ntoa(ts->addr[i]));
-    printf("\n");
-    fflush(stdout); fflush(stderr);
+	ubik_print("%s ", afs_inet_ntoa(ts->addr[i]));
+    ubik_print("\n");
 
     return 0;
 }
@@ -619,12 +618,11 @@ printServerInfo()
     ubik_print("Local CellServDB:");
     for ( ts=ubik_servers; ts; ts= ts->next, j++)
     {
-	printf("Server %d: ", j);
+	ubik_print("Server %d: ", j);
 	for ( i=0; (i<UBIK_MAX_INTERFACE_ADDR) && ts->addr[i]; i++)
-	    printf("%s ", afs_inet_ntoa(ts->addr[i]));
+	    ubik_print("%s ", afs_inet_ntoa(ts->addr[i]));
     }
-    printf("\n");
-    fflush(stdout); fflush(stderr);
+    ubik_print("\n");
 }
 
 SDISK_SetVersion(rxcall, atid, oldversionp, newversionp)
diff --git a/src/ubik/ubik.c b/src/ubik/ubik.c
index 791163382..7b1238d38 100644
--- a/src/ubik/ubik.c
+++ b/src/ubik/ubik.c
@@ -500,7 +500,7 @@ int ubik_EndTrans(transPtr)
 	    to us, or timeout.  Put safety check in anyway */
 	if (now - realStart > 10 * BIGTIME) {
 	    ubik_stats.escapes++;
-	    printf("ubik escaping from commit wait\n");
+	    ubik_print("ubik escaping from commit wait\n");
 	    break;
 	}
 	for(ts = ubik_servers; ts; ts=ts->next) {
@@ -824,9 +824,9 @@ int panic(a, b, c, d)
     char *a, *b, *c, *d;
 {
     ubik_print("Ubik PANIC: ");
-    printf(a, b, c, d);
+    ubik_print(a, b, c, d);
     abort();
-    printf("BACK FROM ABORT\n");    /* shouldn't come back */
+    ubik_print("BACK FROM ABORT\n");    /* shouldn't come back */
     exit(1);	                    /* never know, though  */
 }
 
diff --git a/src/util/serverLog.c b/src/util/serverLog.c
index 5d0f02437..b865f500f 100644
--- a/src/util/serverLog.c
+++ b/src/util/serverLog.c
@@ -116,8 +116,12 @@ void FSLog (const char *format, ...)
     UNLOCK_SERVERLOG();
 
 #if !defined(AFS_PTHREAD_ENV)
-    fflush(stdout);
-    fflush(stderr);     /* in case they're sharing the same FD */
+    if ( ! serverLogSyslog ) {
+		if ( serverLogFD > 0 )
+            fflush(serverLogFD); /* in case not on stdout/stderr */
+        fflush(stdout);
+        fflush(stderr);     /* in case they're sharing the same FD */
+    }
 #endif
 }
 
-- 
2.39.5