jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-19 07:20:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

afs: removing trailing semicolons

Browse Source 
Remove spurious trailing semicolons from macros.

Change-Id: I26550a4ca8e8fe5232dad4cdb2c42a5f44a28f32
Reviewed-on: http://gerrit.openafs.org/9092
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
This commit is contained in:
Chas Williams (CONTRACTOR) 2013-02-11 17:05:34 -05:00 committed by Jeffrey Altman
parent d8fa251a14
commit fb483acf62
31 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/WINNT/afsd/cm_btree.h
View File

@ -206,7 +206,7 @@ extern afs_uint64 bplus_free_time;
/* access tree flag values */
#define settreeflags(B,v) (B->flags |= (v & TREE_FLAGS_MASK))
#define gettreeflags(B) (B->flags)
#define cleartreeflags(B) (B->flags = 0);
#define cleartreeflags(B) (B->flags = 0)
/* access node flag values */
#define setflag(j, v) ((j)->flags |= (v & FLAGS_MASK))

24
src/WINNT/afsd/smb.h
View File

@ -561,19 +561,19 @@ extern void CompensateForSmbClientLastWriteTimeBugs(afs_uint32 *dosTimep);
#ifdef DEBUG_SMB_REFCOUNT
extern smb_vc_t *smb_FindVCDbg(unsigned short lsn, int flags, int lana, char *, long);
#define smb_FindVC(a,b,c) smb_FindVCDbg(a,b,c,__FILE__,__LINE__);
#define smb_FindVC(a,b,c) smb_FindVCDbg(a,b,c,__FILE__,__LINE__)
extern void smb_HoldVCDbg(smb_vc_t *vcp, char *, long);
#define smb_HoldVC(a) smb_HoldVCDbg(a,__FILE__,__LINE__);
#define smb_HoldVC(a) smb_HoldVCDbg(a,__FILE__,__LINE__)
extern void smb_HoldVCNoLockDbg(smb_vc_t *vcp, char *, long);
#define smb_HoldVCNoLock(a) smb_HoldVCNoLockDbg(a,__FILE__,__LINE__);
#define smb_HoldVCNoLock(a) smb_HoldVCNoLockDbg(a,__FILE__,__LINE__)
extern void smb_ReleaseVCDbg(smb_vc_t *vcp, char *, long);
#define smb_ReleaseVC(a) smb_ReleaseVCDbg(a,__FILE__,__LINE__);
#define smb_ReleaseVC(a) smb_ReleaseVCDbg(a,__FILE__,__LINE__)
extern void smb_ReleaseVCNoLockDbg(smb_vc_t *vcp, char *, long);
#define smb_ReleaseVCNoLock(a) smb_ReleaseVCNoLockDbg(a,__FILE__,__LINE__);
#define smb_ReleaseVCNoLock(a) smb_ReleaseVCNoLockDbg(a,__FILE__,__LINE__)
#else
extern smb_vc_t *smb_FindVC(unsigned short lsn, int flags, int lana);
@ -592,13 +592,13 @@ extern void smb_MarkAllVCsDead(smb_vc_t *exclude_vcp);
#ifdef DEBUG_SMB_REFCOUNT
extern smb_tid_t *smb_FindTIDDbg(smb_vc_t *vcp, unsigned short tid, int flags, char *, long);
#define smb_FindTID(a,b,c) smb_FindTIDDbg(a,b,c,__FILE__,__LINE__);
#define smb_FindTID(a,b,c) smb_FindTIDDbg(a,b,c,__FILE__,__LINE__)
extern void smb_HoldTIDNoLockDbg(smb_tid_t *tidp, char *, long);
#define smb_HoldTIDNoLock(a) smb_HoldTIDNoLockDbg(a,__FILE__,__LINE__);
#define smb_HoldTIDNoLock(a) smb_HoldTIDNoLockDbg(a,__FILE__,__LINE__)
extern void smb_ReleaseTIDDbg(smb_tid_t *tidp, afs_uint32 locked, char *, long);
#define smb_ReleaseTID(a,b) smb_ReleaseTIDDbg(a,b,__FILE__,__LINE__);
#define smb_ReleaseTID(a,b) smb_ReleaseTIDDbg(a,b,__FILE__,__LINE__)
#else
extern smb_tid_t *smb_FindTID(smb_vc_t *vcp, unsigned short tid, int flags);
@ -633,16 +633,16 @@ extern long smb_LookupTIDPath(smb_vc_t *vcp, unsigned short tid, clientchar_t **
#ifdef DEBUG_SMB_REFCOUNT
extern smb_fid_t *smb_FindFIDDbg(smb_vc_t *vcp, unsigned short fid, int flags, char *, long);
#define smb_FindFID(a,b,c) smb_FindFIDDbg(a,b,c,__FILE__,__LINE__);
#define smb_FindFID(a,b,c) smb_FindFIDDbg(a,b,c,__FILE__,__LINE__)
extern smb_fid_t *smb_FindFIDByScacheDbg(smb_vc_t *vcp, cm_scache_t * scp, char *, long);
#define smb_FindFIDByScache(a,b) smb_FindFIDByScacheDbg(a,b,__FILE__,__LINE__);
#define smb_FindFIDByScache(a,b) smb_FindFIDByScacheDbg(a,b,__FILE__,__LINE__)
extern void smb_HoldFIDNoLockDbg(smb_fid_t *fidp, char *, long);
#define smb_HoldFIDNoLock(a) smb_HoldFIDNoLockDbg(a,__FILE__,__LINE__);
#define smb_HoldFIDNoLock(a) smb_HoldFIDNoLockDbg(a,__FILE__,__LINE__)
extern void smb_ReleaseFIDDbg(smb_fid_t *fidp, char *, long);
#define smb_ReleaseFID(a) smb_ReleaseFIDDbg(a,__FILE__,__LINE__);
#define smb_ReleaseFID(a) smb_ReleaseFIDDbg(a,__FILE__,__LINE__)
#else
extern smb_fid_t *smb_FindFID(smb_vc_t *vcp, unsigned short fid, int flags);

2
src/WINNT/afsd/test/convtest.c
View File

@ -327,7 +327,7 @@ int main(int argc, char ** argv)
cm_InitNormalization();
#define RUNTEST(f) printf("Begin " #f "\n"); trv = f(); printf ("End " #f "\n\n"); if (trv != 0) return trv;
#define RUNTEST(f) printf("Begin " #f "\n"); trv = f(); printf ("End " #f "\n\n"); if (trv != 0) return trv
RUNTEST(cm_NormalizeStringAllocTest);
RUNTEST(cm_NormalizeStringTest);

2
src/WINNT/afsrdr/kernel/lib/Include/AFSDefines.h
View File

@ -227,7 +227,7 @@ NTSTATUS
((((ULONG)(Ptr)) + 7) & 0xfffffff8) \
)
#define CRC32_POLYNOMIAL 0xEDB88320L;
#define CRC32_POLYNOMIAL 0xEDB88320L
#define AFS_SERVER_FLUSH_DELAY (5LL * AFS_ONE_SECOND)
#define AFS_SERVER_PURGE_DELAY (300LL * AFS_ONE_SECOND)

2
src/WINNT/kfw/inc/krb4/conf-pc.h
View File

@ -102,7 +102,7 @@ typedef unsigned int WORD;
#define RANDOM_KRB_INT32_1 ((KRB_INT32) time(NULL))
#define RANDOM_KRB_INT32_2 ((KRB_INT32) getpid())
#define TIME_GMT_UNIXSEC unix_time_gmt_unixsec((unsigned KRB_INT32 *)0);
#define TIME_GMT_UNIXSEC unix_time_gmt_unixsec((unsigned KRB_INT32 *)0)
#ifndef MAXPATHLEN
#define MAXPATHLEN _MAX_PATH
#endif

2
src/WINNT/tests/nmtest/nmtest.c
View File

@ -54,7 +54,7 @@ void dump_hex(BYTE * buffer, int cb)
fprintf(stderr, "\n");
}
#define CCall(f) if (!f) goto done;
#define CCall(f) if (!f) goto done
BOOL init_test_data(void)
{

2
src/afs/AIX/osi_sleep.c
View File

@ -83,7 +83,7 @@ afs_osi_Wait(afs_int32 ams, struct afs_osi_WaitHandle *ahandle, int aintok)
afs_event_t *afs_evhasht[AFS_EVHASHSIZE]; /* Hash table for events */
#define afs_evhash(event) (afs_uint32) ((((long)event)>>2) & (AFS_EVHASHSIZE-1));
#define afs_evhash(event) (afs_uint32) ((((long)event)>>2) & (AFS_EVHASHSIZE-1))
int afs_evhashcnt = 0;
/* Get and initialize event structure corresponding to lwp event (i.e. address)

10
src/afs/DARWIN/osi_machdep.h
View File

@ -69,7 +69,7 @@ enum vcexcl { EXCL, NONEXCL };
#ifndef AFS_DARWIN80_ENV
#define vnode_clearfsnode(x) ((x)->v_data = 0)
#define vnode_fsnode(x) (x)->v_data
#define vnode_lock(x) vn_lock(x, LK_EXCLUSIVE | LK_RETRY, current_proc());
#define vnode_lock(x) vn_lock(x, LK_EXCLUSIVE | LK_RETRY, current_proc())
#define vnode_isvroot(x) (((x)->v_flag & VROOT)?1:0)
#define vnode_vtype(x) (x)->v_type
#define vnode_isdir(x) ((x)->v_type == VDIR)
@ -143,7 +143,7 @@ typedef struct proc afs_proc_t;
#define osi_vnhold(avc,r) VN_HOLD(AFSTOV(avc))
#define VN_HOLD(vp) darwin_vn_hold(vp)
#define VN_RELE(vp) vrele(vp);
#define VN_RELE(vp) vrele(vp)
void darwin_vn_hold(struct vnode *vp);
@ -205,11 +205,11 @@ extern struct lock__bsd__ afs_global_lock;
#define USERPRI
#if 0
#undef SPLVAR
#define SPLVAR int x;
#define SPLVAR int x
#undef NETPRI
#define NETPRI x=splnet();
#define NETPRI x=splnet()
#undef USERPRI
#define USERPRI splx(x);
#define USERPRI splx(x)
#endif
#define AFS_APPL_UFS_CACHE 1

2
src/afs/DARWIN/osi_sleep.c
View File

@ -98,7 +98,7 @@ afs_osi_Wait(afs_int32 ams, struct afs_osi_WaitHandle *ahandle, int aintok)
#define EVTLOCK_DESTROY(e)
#endif
afs_event_t *afs_evhasht[AFS_EVHASHSIZE]; /* Hash table for events */
#define afs_evhash(event) (afs_uint32) ((((long)event)>>2) & (AFS_EVHASHSIZE-1));
#define afs_evhash(event) (afs_uint32) ((((long)event)>>2) & (AFS_EVHASHSIZE-1))
int afs_evhashcnt = 0;
/* Get and initialize event structure corresponding to lwp event (i.e. address)

2
src/afs/FBSD/osi_sleep.c
View File

@ -76,7 +76,7 @@ afs_osi_Wait(afs_int32 ams, struct afs_osi_WaitHandle *ahandle, int aintok)
}
afs_event_t *afs_evhasht[AFS_EVHASHSIZE]; /* Hash table for events */
#define afs_evhash(event) (afs_uint32) ((((long)event)>>2) & (AFS_EVHASHSIZE-1));
#define afs_evhash(event) (afs_uint32) ((((long)event)>>2) & (AFS_EVHASHSIZE-1))
int afs_evhashcnt = 0;
/* Get and initialize event structure corresponding to lwp event (i.e. address)

4
src/afs/FBSD/osi_vm.c
View File

@ -47,12 +47,12 @@
#if defined(AFS_FBSD80_ENV)
#define lock_vnode(v, f) vn_lock((v), (f))
#define ilock_vnode(v) vn_lock((v), LK_INTERLOCK|LK_EXCLUSIVE|LK_RETRY);
#define ilock_vnode(v) vn_lock((v), LK_INTERLOCK|LK_EXCLUSIVE|LK_RETRY)
#define unlock_vnode(v) VOP_UNLOCK((v), 0)
#define islocked_vnode(v) VOP_ISLOCKED((v))
#else
#define lock_vnode(v, f) vn_lock((v), (f), curthread)
#define ilock_vnode(v) vn_lock((v), LK_INTERLOCK|LK_EXCLUSIVE|LK_RETRY, curthread);
#define ilock_vnode(v) vn_lock((v), LK_INTERLOCK|LK_EXCLUSIVE|LK_RETRY, curthread)
#define unlock_vnode(v) VOP_UNLOCK((v), 0, curthread)
#define islocked_vnode(v) VOP_ISLOCKED((v), curthread)
#endif

4
src/afs/IRIX/osi_sleep.c
View File

@ -73,9 +73,9 @@ afs_osi_Wait(afs_int32 ams, struct afs_osi_WaitHandle *ahandle, int aintok)
afs_event_t *afs_evhasht[AFS_EVHASHSIZE]; /* Hash table for events */
#if (_MIPS_SZPTR == 64)
#define afs_evhash(event) (afs_uint32) ((((long)event)>>3) & (AFS_EVHASHSIZE-1));
#define afs_evhash(event) (afs_uint32) ((((long)event)>>3) & (AFS_EVHASHSIZE-1))
#else
#define afs_evhash(event) (afs_uint32) ((((long)event)>>2) & (AFS_EVHASHSIZE-1));
#define afs_evhash(event) (afs_uint32) ((((long)event)>>2) & (AFS_EVHASHSIZE-1))
#endif
int afs_evhashcnt = 0;

4
src/afs/LINUX/osi_sleep.c
View File

@ -68,7 +68,7 @@ afs_osi_Wait(afs_int32 ams, struct afs_osi_WaitHandle *ahandle, int aintok)
}
afs_event_t *afs_evhasht[AFS_EVHASHSIZE]; /* Hash table for events */
#define afs_evhash(event) (afs_uint32) ((((long)event)>>2) & (AFS_EVHASHSIZE-1));
#define afs_evhash(event) (afs_uint32) ((((long)event)>>2) & (AFS_EVHASHSIZE-1))
int afs_evhashcnt = 0;
/* Get and initialize event structure corresponding to lwp event (i.e. address)
@ -125,7 +125,7 @@ afs_addevent(char *event)
}
#ifndef set_current_state
#define set_current_state(x) current->state = (x);
#define set_current_state(x) current->state = (x)
#endif
/* Release the specified event */

4
src/afs/LINUX24/osi_sleep.c
View File

@ -74,7 +74,7 @@ afs_osi_Wait(afs_int32 ams, struct afs_osi_WaitHandle *ahandle, int aintok)
afs_event_t *afs_evhasht[AFS_EVHASHSIZE]; /* Hash table for events */
#define afs_evhash(event) (afs_uint32) ((((long)event)>>2) & (AFS_EVHASHSIZE-1));
#define afs_evhash(event) (afs_uint32) ((((long)event)>>2) & (AFS_EVHASHSIZE-1))
int afs_evhashcnt = 0;
/* Get and initialize event structure corresponding to lwp event (i.e. address)
@ -140,7 +140,7 @@ afs_addevent(char *event)
}
#ifndef set_current_state
#define set_current_state(x) current->state = (x);
#define set_current_state(x) current->state = (x)
#endif
/* Release the specified event */

2
src/afs/NBSD/osi_sleep.c
View File

@ -194,7 +194,7 @@ afs_osi_Wait(afs_int32 ams, struct afs_osi_WaitHandle *ahandle, int aintok)
afs_event_t *afs_evhasht[AFS_EVHASHSIZE]; /* Hash table for events */
#define afs_evhash(event) (afs_uint32) ((((long)event)>>2) & (AFS_EVHASHSIZE-1));
#define afs_evhash(event) (afs_uint32) ((((long)event)>>2) & (AFS_EVHASHSIZE-1))
int afs_evhashcnt = 0;
/* Get and initialize event structure corresponding to lwp event (i.e. address)

2
src/afs/OBSD/osi_sleep.c
View File

@ -126,7 +126,7 @@ afs_osi_Wait(afs_int32 ams, struct afs_osi_WaitHandle *ahandle, int aintok)
}
afs_event_t *afs_evhasht[AFS_EVHASHSIZE]; /* Hash table for events */
#define afs_evhash(event) (afs_uint32) ((((long)event)>>2) & (AFS_EVHASHSIZE-1));
#define afs_evhash(event) (afs_uint32) ((((long)event)>>2) & (AFS_EVHASHSIZE-1))
int afs_evhashcnt = 0;
/* Get and initialize event structure corresponding to lwp event (i.e. address)

4
src/afs/SOLARIS/osi_machdep.h
View File

@ -87,8 +87,8 @@ local_osi_Time()
#include <sys/mutex.h>
extern kmutex_t afs_global_lock;
#define AFS_GLOCK() mutex_enter(&afs_global_lock);
#define AFS_GUNLOCK() mutex_exit(&afs_global_lock);
#define AFS_GLOCK() mutex_enter(&afs_global_lock)
#define AFS_GUNLOCK() mutex_exit(&afs_global_lock)
#define ISAFS_GLOCK() mutex_owned(&afs_global_lock)
#define osi_InitGlock() \
mutex_init(&afs_global_lock, "afs_global_lock", MUTEX_DEFAULT, NULL);

2
src/afs/SOLARIS/osi_sleep.c
View File

@ -72,7 +72,7 @@ afs_osi_Wait(afs_int32 ams, struct afs_osi_WaitHandle *ahandle, int aintok)
afs_event_t *afs_evhasht[AFS_EVHASHSIZE]; /* Hash table for events */
#define afs_evhash(event) (afs_uint32) ((((long)event)>>2) & (AFS_EVHASHSIZE-1));
#define afs_evhash(event) (afs_uint32) ((((long)event)>>2) & (AFS_EVHASHSIZE-1))
int afs_evhashcnt = 0;
/* Get and initialize event structure corresponding to lwp event (i.e. address)

6
src/afs/afs.h
View File

@ -725,9 +725,9 @@ struct SimpleLocks {
#else
#define VREFCOUNT(v) ((v)->vrefCount)
#define VREFCOUNT_GT(v,y) ((v)->vrefCount > (y))
#define VREFCOUNT_SET(v, c) (v)->vrefCount = c;
#define VREFCOUNT_DEC(v) (v)->vrefCount--;
#define VREFCOUNT_INC(v) (v)->vrefCount++;
#define VREFCOUNT_SET(v, c) (v)->vrefCount = c
#define VREFCOUNT_DEC(v) (v)->vrefCount--
#define VREFCOUNT_INC(v) (v)->vrefCount++
#define d_unhash(d) list_empty(&(d)->d_hash)
#define dget_locked(d) dget(d)
#endif

8
src/config/stds.h
View File

@ -88,10 +88,10 @@ typedef unsigned long long afs_uint64;
#ifndef HAVE_INT64TOINT32
#define Int64ToInt32(a) (a) & MAX_AFS_UINT32
#endif
#define FillInt64(t,h,l) (t) = ((afs_int64)(h) << 32) | (l);
#define SplitInt64(t,h,l) (h) = ((afs_int64)t) >> 32; (l) = (t) & MAX_AFS_UINT32;
#define RoundInt64ToInt32(a) (a > MAX_AFS_UINT32) ? MAX_AFS_UINT32 : a;
#define RoundInt64ToInt31(a) (a > MAX_AFS_INT32) ? MAX_AFS_INT32 : a;
#define FillInt64(t,h,l) (t) = ((afs_int64)(h) << 32) | (l)
#define SplitInt64(t,h,l) (h) = ((afs_int64)t) >> 32; (l) = (t) & MAX_AFS_UINT32
#define RoundInt64ToInt32(a) (a > MAX_AFS_UINT32) ? MAX_AFS_UINT32 : a
#define RoundInt64ToInt31(a) (a > MAX_AFS_INT32) ? MAX_AFS_INT32 : a
#ifdef AFS_64BIT_CLIENT
typedef afs_int64 afs_size_t;

6
src/gtx/gtxobjects.h
View File

@ -58,9 +58,9 @@ struct onodeops {
/*
* Macros facilitating the use of onode functions.
*/
#define OOP_DESTROY(ONP) (ONP)->o_op->on_destroy(ONP);
#define OOP_DISPLAY(ONP) (ONP)->o_op->on_display(ONP);
#define OOP_RELEASE(ONP) (ONP)->o_op->on_release(ONP);
#define OOP_DESTROY(ONP) (ONP)->o_op->on_destroy(ONP)
#define OOP_DISPLAY(ONP) (ONP)->o_op->on_display(ONP)
#define OOP_RELEASE(ONP) (ONP)->o_op->on_release(ONP)
/*
* Initialization parameters for an onode.

6
src/kauth/crypt.c
View File

@ -681,14 +681,14 @@ des_cipher(const char *in, char *out, long salt, int num_iter)
#define SPTAB(t, i) (*(long *)((unsigned char *)t + i*(sizeof(long)/4)))
#if defined(gould)
/* use this if B.b[i] is evaluated just once ... */
#define DOXOR(x,y,i) x^=SPTAB(SPE[0][i],B.b[i]); y^=SPTAB(SPE[1][i],B.b[i]);
#define DOXOR(x,y,i) x^=SPTAB(SPE[0][i],B.b[i]); y^=SPTAB(SPE[1][i],B.b[i])
#else
#if defined(pdp11)
/* use this if your "long" int indexing is slow */
#define DOXOR(x,y,i) j=B.b[i]; x^=SPTAB(SPE[0][i],j); y^=SPTAB(SPE[1][i],j);
#define DOXOR(x,y,i) j=B.b[i]; x^=SPTAB(SPE[0][i],j); y^=SPTAB(SPE[1][i],j)
#else
/* use this if "k" is allocated to a register ... */
#define DOXOR(x,y,i) k=B.b[i]; x^=SPTAB(SPE[0][i],k); y^=SPTAB(SPE[1][i],k);
#define DOXOR(x,y,i) k=B.b[i]; x^=SPTAB(SPE[0][i],k); y^=SPTAB(SPE[1][i],k)
#endif
#endif

6
src/kauth/test/test_getticket.c
View File

@ -133,9 +133,9 @@ SetFields(conn, name, flags, expiration, lifetime)
}
}
#define SetLife(c,n,l) SetFields (c,n,0,0,l);
#define SetExp(c,n,e) SetFields (c,n,0,e,0);
#define SetFlags(c,n,f) SetFields (c,n,f,0,0);
#define SetLife(c,n,l) SetFields (c,n,0,0,l)
#define SetExp(c,n,e) SetFields (c,n,0,e,0)
#define SetFlags(c,n,f) SetFields (c,n,f,0,0)
#define EXACT 0x5b
#define KERBEROS 0x2a

4
src/lwp/lock.h
View File

@ -45,8 +45,8 @@
#ifdef AFS_PTHREAD_ENV
#include <afs/opr.h>
#include <opr/lock.h>
#define LOCK_LOCK(A) opr_mutex_enter(&(A)->mutex);
#define LOCK_UNLOCK(A) opr_mutex_exit(&(A)->mutex);
#define LOCK_LOCK(A) opr_mutex_enter(&(A)->mutex)
#define LOCK_UNLOCK(A) opr_mutex_exit(&(A)->mutex)
#else /* AFS_PTHREAD_ENV */
#define LOCK_LOCK(A)
#define LOCK_UNLOCK(A)

2
src/mcas/gc.c
View File

@ -54,7 +54,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
/* Recycled nodes are filled with this value if WEAK_MEM_ORDER. */
#define INVALID_BYTE 0
#define INITIALISE_NODES(_p,_c) memset((_p), INVALID_BYTE, (_c));
#define INITIALISE_NODES(_p,_c) memset((_p), INVALID_BYTE, (_c))
/* Number of unique block sizes we can deal with. Equivalently, the
* number of unique object caches which can be created. */

2
src/mcas/skip_cas_func.c
View File

@ -78,7 +78,7 @@ static int gc_id[NUM_LEVELS];
* PRIVATE FUNCTIONS
*/
#define compare_keys(s, k1, k2) (s->cmpf(k1, k2));
#define compare_keys(s, k1, k2) (s->cmpf(k1, k2))
/*
* Random level generator. Drop-off rate is 0.5 per level.

2
src/platform/DARWIN/AFSPreference/global.h
View File

@ -26,7 +26,7 @@
#define kDoYouWantCreateTheDirectory NSLocalizedStringFromTableInBundle(@"DoYouWantCreateTheDirectory",nil,[NSBundle bundleForClass:[self class]],@"DoYouWantCreateTheDirectory")
#define kDirectoryCreated NSLocalizedStringFromTableInBundle(@"DirectoryCreated",nil,[NSBundle bundleForClass:[self class]],@"DirectoryCreated")
#define kErrorCreatingDirectory NSLocalizedStringFromTableInBundle(@"ErrorCreatingDirectory",nil,[NSBundle bundleForClass:[self class]],@"ErrorCreatingDirectory")
#define kErrorGettongSystemVersion NSLocalizedString(@"ErrorGettongSystemVersion",@"ErrorGettongSystemVersion");
#define kErrorGettongSystemVersion NSLocalizedString(@"ErrorGettongSystemVersion",@"ErrorGettongSystemVersion")
// PREFERENCE KEY

2
src/rx/NBSD/rx_kmutex.h
View File

@ -40,7 +40,7 @@ typedef kmutex_t afs_kmutex_t;
#define MUTEX_INIT(a,b,c,d) mutex_init((a), (c), IPL_NONE)
#define MUTEX_DESTROY(a) mutex_destroy((a))
#define MUTEX_ENTER(a) mutex_enter((a));
#define MUTEX_ENTER(a) mutex_enter((a))
#define MUTEX_TRYENTER(a) mutex_tryenter((a))
#define MUTEX_EXIT(a) mutex_exit((a))
#define MUTEX_ASSERT(a) osi_Assert(mutex_owned((a)))

4
src/util/serverLog.c
View File

@ -33,8 +33,8 @@
#if defined(AFS_PTHREAD_ENV)
#include <pthread.h>
static pthread_mutex_t serverLogMutex;
#define LOCK_SERVERLOG() opr_Verify(pthread_mutex_lock(&serverLogMutex) == 0);
#define UNLOCK_SERVERLOG() opr_Verify(pthread_mutex_unlock(&serverLogMutex) == 0);
#define LOCK_SERVERLOG() opr_Verify(pthread_mutex_lock(&serverLogMutex) == 0)
#define UNLOCK_SERVERLOG() opr_Verify(pthread_mutex_unlock(&serverLogMutex) == 0)
#ifdef AFS_NT40_ENV
#define NULLDEV "NUL"

4
src/viced/host.h
View File

@ -24,8 +24,8 @@
#include <rx/rx_globals.h>
#include <pthread.h>
extern pthread_mutex_t host_glock_mutex;
#define H_LOCK opr_mutex_enter(&host_glock_mutex);
#define H_UNLOCK opr_mutex_exit(&host_glock_mutex);
#define H_LOCK opr_mutex_enter(&host_glock_mutex)
#define H_UNLOCK opr_mutex_exit(&host_glock_mutex)
extern pthread_key_t viced_uclient_key;
#define h_MAXHOSTTABLEENTRIES 1000

8
src/viced/viced.h
View File

@ -195,11 +195,11 @@ extern int saneacls;
* HostCheck, Signal, min 2 for RXSTATS */
#include <pthread.h>
extern pthread_mutex_t fileproc_glock_mutex;
#define FS_LOCK opr_mutex_enter(&fileproc_glock_mutex);
#define FS_UNLOCK opr_mutex_exit(&fileproc_glock_mutex);
#define FS_LOCK opr_mutex_enter(&fileproc_glock_mutex)
#define FS_UNLOCK opr_mutex_exit(&fileproc_glock_mutex)
extern pthread_mutex_t fsync_glock_mutex;
#define FSYNC_LOCK opr_mutex_enter(&fsync_glock_mutex);
#define FSYNC_UNLOCK opr_mutex_exit(&fsync_glock_mutex);
#define FSYNC_LOCK opr_mutex_enter(&fsync_glock_mutex)
#define FSYNC_UNLOCK opr_mutex_exit(&fsync_glock_mutex)
#ifdef AFS_DEMAND_ATTACH_FS