placate-netbsd-cc-20040826

netbsd's cc doesn't like multiple semicolons in variable declarations,
so let's adjust the XSTATS_DECLS macro appropriately.

====================
This delta was composed from multiple commits as part of the CVS->Git migration.
The checkin message with each commit was inconsistent.
The following are the additional commit messages.
====================

netbsd's cc doesn't like multiple semicolons in variable declarations,
so move OSI_VC_CONVERT down to the last statement

diff --git a/src/afs/VNOPS/afs_vnop_lookup.c b/src/afs/VNOPS/afs_vnop_lookup.c
index c2a413a32502f386be0be3d5f19d23c7caff0df9..bb908163d6192b7ac4f2d3b156268bf3161b737d 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_lookup.c
+++ b/src/afs/VNOPS/afs_vnop_lookup.c
@@ -1128,13 +1128,13 @@ afs_lookup(adp, aname, avcp, acred)
     int pass = 0, hit = 0;
     long dirCookie;
     extern afs_int32 afs_mariner;      /*Writing activity to log? */
-    OSI_VC_CONVERT(adp);
     afs_hyper_t versionNo;
     int no_read_access = 0;
     struct sysname_info sysState;      /* used only for @sys checking */
     int dynrootRetry = 1;
     struct afs_fakestat_state fakestate;
     int tryEvalOnly = 0;
+    OSI_VC_CONVERT(adp);
 
     AFS_STATCNT(afs_lookup);
     afs_InitFakeStat(&fakestate);

diff --git a/src/afs/afs_stats.h b/src/afs/afs_stats.h
index 35f6575a1d661074bae5a298df86c50358516ee1..2fa76aa2a411838af3359adadda5d8c35add163f 100644 (file)
--- a/src/afs/afs_stats.h
+++ b/src/afs/afs_stats.h
@@ -46,7 +46,7 @@ typedef struct timeval osi_timeval_t;
 #endif /* !KERNEL */
 
 #define XSTATS_DECLS struct afs_stats_opTimingData *opP; \
-    osi_timeval_t opStartTime, opStopTime, elapsedTime;
+    osi_timeval_t opStartTime, opStopTime, elapsedTime
 
 #define XSTATS_START_TIME(arg) \
   opP = &(afs_stats_cmfullperf.rpc.fsRPCTimes[arg]); \