From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Fri, 1 Aug 2008 05:23:56 +0000 (+0000)
Subject: DEVEL15-windows-osilog-20080731
X-Git-Tag: openafs-devel-1_5_52~49
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=f044af3148614b65086a5589cad3e1db380c161a;p=packages%2Fo%2Fopenafs.git

DEVEL15-windows-osilog-20080731

LICENSE MIT

increase the number of parms from 4 to 5 for osi_Log


(cherry picked from commit c38036761eef51f26b085ca8bc69f4a0a65a2f4a)
---

diff --git a/src/WINNT/client_osi/osilog.c b/src/WINNT/client_osi/osilog.c
index 9b5beb163..39126e253 100644
--- a/src/WINNT/client_osi/osilog.c
+++ b/src/WINNT/client_osi/osilog.c
@@ -141,9 +141,9 @@ void osi_LogPanic(char *filep, size_t lineNumber)
 
 		/* otherwise, proceed */
 		if (filep)
-	                osi_LogAdd(tlp, "**PANIC** (file %s:%d)", (size_t) filep, lineNumber, 0, 0);
+	                osi_LogAdd(tlp, "**PANIC** (file %s:%d)", (size_t) filep, lineNumber, 0, 0, 0);
 		else
-			osi_LogAdd(tlp, "**PANIC**", 0, 0, 0, 0);
+			osi_LogAdd(tlp, "**PANIC**", 0, 0, 0, 0, 0);
 		
                 /* should grab lock for this, but we're in panic, and better safe than
                  * sorry.
@@ -176,7 +176,7 @@ void osi_LogFree(osi_log_t *logp)
 }
 
 /* add an element to a log */
-void osi_LogAdd(osi_log_t *logp, char *formatp, size_t p0, size_t p1, size_t p2, size_t p3)
+void osi_LogAdd(osi_log_t *logp, char *formatp, size_t p0, size_t p1, size_t p2, size_t p3, size_t p4)
 {
 	osi_logEntry_t *lep;
         long ix;
@@ -218,10 +218,10 @@ void osi_LogAdd(osi_log_t *logp, char *formatp, size_t p0, size_t p1, size_t p2,
         lep->parms[1] = p1;
         lep->parms[2] = p2;
         lep->parms[3] = p3;
-
+        lep->parms[4] = p4;
 #ifdef NOTSERVICE
         printf( "%9ld:", lep->micros );
-        printf( formatp, p0, p1, p2, p3);
+        printf( formatp, p0, p1, p2, p3, p4);
         printf( "\n" );
 #endif
 
@@ -229,7 +229,7 @@ void osi_LogAdd(osi_log_t *logp, char *formatp, size_t p0, size_t p1, size_t p2,
 	    char wholemsg[1024], msg[1000];
 
 	    StringCbPrintfA(msg, sizeof(msg), formatp,
-                            p0, p1, p2, p3);
+                            p0, p1, p2, p3, p4);
 	    StringCbPrintfA(wholemsg, sizeof(wholemsg), 
                             "tid[%d] %s\n",
                             lep->tid, msg);
@@ -255,7 +255,8 @@ void osi_LogPrint(osi_log_t *logp, FILE_HANDLE handle)
 		lep = logp->datap + ix;		/* pointer arithmetic */
 		StringCbPrintfA(msg, sizeof(msg), lep->formatp,
                                 lep->parms[0], lep->parms[1],
-                                lep->parms[2], lep->parms[3]);
+                                lep->parms[2], lep->parms[3],
+                                lep->parms[4]);
 		StringCbPrintfA(wholemsg, sizeof(wholemsg),
                                 "time %d.%06d, tid %d %s\r\n",
                                 lep->micros / 1000000,
@@ -371,7 +372,7 @@ long osi_LogFDGetInfo(osi_fd_t *ifd, osi_remGetInfoParms_t *outp)
     lep = logp->datap + ix;	/* ptr arith to current index */
 
     StringCbPrintfA(tbuffer, sizeof(tbuffer), lep->formatp, lep->parms[0], lep->parms[1],
-                    lep->parms[2], lep->parms[3]);
+                    lep->parms[2], lep->parms[3], lep->parms[4]);
 
     /* now copy out info */
     StringCbCopyA(outp->sdata[0], sizeof(outp->sdata[0]), tbuffer);
diff --git a/src/WINNT/client_osi/osilog.h b/src/WINNT/client_osi/osilog.h
index 6ec6f58cb..421fb6658 100644
--- a/src/WINNT/client_osi/osilog.h
+++ b/src/WINNT/client_osi/osilog.h
@@ -20,7 +20,7 @@
 
 #define OSI_LOG_DEFAULTSIZE	1000
 #define OSI_LOG_STRINGSIZE	256
-#define OSI_LOG_MAXPARMS	4	/* max # of int parms */
+#define OSI_LOG_MAXPARMS	5	/* max # of int parms */
 
 typedef struct osi_logEntry {
 	size_t tid;			/* thread ID */
@@ -59,7 +59,7 @@ extern osi_log_t *osi_LogCreate(char *, size_t);
 
 extern void osi_LogFree(osi_log_t *);
 
-extern void osi_LogAdd(osi_log_t *, char *, size_t, size_t, size_t, size_t);
+extern void osi_LogAdd(osi_log_t *, char *, size_t, size_t, size_t, size_t, size_t);
 
 extern void osi_LogReset(osi_log_t *);
 
@@ -87,11 +87,11 @@ extern void osi_LogEvent(char *a,char *b,char *c,...);
 extern char *osi_HexifyString(char *s);
 
 /* define macros */
-#define osi_Log0(l,f)		if ((l) && (l)->enabled) osi_LogAdd((l), (f), 0, 0, 0, 0)
-#define osi_Log1(l,f,a)		if ((l) && (l)->enabled) osi_LogAdd((l), (f), (size_t) (a), 0, 0, 0)
-#define osi_Log2(l,f,a,b)	if ((l) && (l)->enabled) osi_LogAdd((l), (f), (size_t) (a), (size_t) (b), 0, 0)
-#define osi_Log3(l,f,a,b,c)	if ((l) && (l)->enabled) osi_LogAdd((l), (f), (size_t) (a), (size_t) (b), (size_t) (c), 0)
-#define osi_Log4(l,f,a,b,c,d)	if ((l) && (l)->enabled) osi_LogAdd((l), (f), (size_t) (a), (size_t) (b), (size_t) (c), (size_t) (d))
+#define osi_Log0(l,f)		if ((l) && (l)->enabled) osi_LogAdd((l), (f), 0, 0, 0, 0, 0)
+#define osi_Log1(l,f,a)		if ((l) && (l)->enabled) osi_LogAdd((l), (f), (size_t) (a), 0, 0, 0, 0)
+#define osi_Log2(l,f,a,b)	if ((l) && (l)->enabled) osi_LogAdd((l), (f), (size_t) (a), (size_t) (b), 0, 0, 0)
+#define osi_Log3(l,f,a,b,c)	if ((l) && (l)->enabled) osi_LogAdd((l), (f), (size_t) (a), (size_t) (b), (size_t) (c), 0, 0)
+#define osi_Log4(l,f,a,b,c,d)	if ((l) && (l)->enabled) osi_LogAdd((l), (f), (size_t) (a), (size_t) (b), (size_t) (c), (size_t) (d), 0)
 #define osi_Log5(l,f,a,b,c,d,e)	if ((l) && (l)->enabled) osi_LogAdd((l), (f), (size_t) (a), (size_t) (b), (size_t) (c), (size_t) (d), (size_t) (e))
 
 #ifdef DEBUG_VERBOSE