don't store in struct volume pointers to charset function table, we only need texten...

[netatalk.git] / etc / afpd / quota.c

diff --git a/etc/afpd/quota.c b/etc/afpd/quota.c
index ea2e6b8bb49798321067c09fc783a6c71226ee1b..2a12ca5e73e9932a6167e78cd3257f2a99616f06 100644 (file)
--- a/etc/afpd/quota.c
+++ b/etc/afpd/quota.c
@@ -1,5 +1,5 @@
 /*
- * $Id: quota.c,v 1.25 2005-04-28 20:49:44 bfernhomberg Exp $
+ * $Id: quota.c,v 1.32 2009-10-14 02:24:05 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -46,7 +46,10 @@ char *strchr (), *strrchr ();
 #include "volume.h"
 #include "unix.h"
 
+/*
 #define DEBUG_QUOTA 0
+*/
+
 #define WANT_USER_QUOTA 0
 #define WANT_GROUP_QUOTA 1
 
@@ -67,6 +70,11 @@ static int overquota( struct dqblk *);
 #ifdef HAVE_XFS_XQM_H
 #include <xfs/xqm.h>
 #define HAVE_LINUX_XQM_H
+#else
+#ifdef  HAVE_LINUX_DQBLK_XFS_H
+#include <linux/dqblk_xfs.h>
+#define HAVE_LINUX_XQM_H
+#endif /* HAVE_LINUX_DQBLK_XFS_H */
 #endif /* HAVE_XFS_XQM_H */
 #endif /* HAVE_LINUX_XQM_H */
 
@@ -182,11 +190,7 @@ static int get_linux_quota(int what, char *path, uid_t euser_id, struct dqblk *d
  Abstract out the XFS Quota Manager quota get call.
 ****************************************************************************/
 
-static int get_linux_xfs_quota(what, path, euser_id, dqb)
-int what;
-char *path;
-uid_t euser_id;
-struct dqblk *dqb;
+static int get_linux_xfs_quota(int what, char *path, uid_t euser_id, struct dqblk *dqb)
 {
        int ret = -1;
 #ifdef HAVE_LINUX_XQM_H
@@ -213,11 +217,7 @@ struct dqblk *dqb;
 ** For API v2 the results are copied back into a v1 structure.
 ** Taken from quota-1.4.8 perl module
 */
-static int get_linux_fs_quota( what, path, euser_id, dqb)
-int what;
-char *path;
-uid_t euser_id;
-struct dqblk *dqb;
+static int get_linux_fs_quota(int what, char *path, uid_t euser_id, struct dqblk *dqb)
 {
        int ret;
 
@@ -289,9 +289,7 @@ struct dqblk *dqb;
  * on which "file" resides.  Returns NULL on failure.
  */
 static char *
-mountp( file, nfs)
-char   *file;
-int         *nfs;
+mountp( char *file, int *nfs)
 {
     struct stat                        sb;
     FILE                       *mtab;
@@ -336,9 +334,7 @@ int         *nfs;
 */
 
 static char *
-special( file, nfs )
-char *file;
-int  *nfs;
+special( char *file, int *nfs)
 {
     static struct fs_data      fsd;
 
@@ -357,9 +353,7 @@ int  *nfs;
 #if (defined(HAVE_SYS_MOUNT_H) && !defined(__linux__)) || defined(BSD4_4) || defined(_IBMR2)
 
 static char *
-special( file, nfs )
-char   *file;
-int         *nfs;
+special(char *file, int *nfs)
 {
     static struct statfs       sfs;
 
@@ -382,9 +376,7 @@ int         *nfs;
 #else /* BSD4_4 */
 
 static char *
-special( file, nfs )
-char *file;
-int *nfs;
+special(char *file, int *nfs)
 {
     struct stat                sb;
     FILE               *mtab;
@@ -435,10 +427,7 @@ int *nfs;
 #endif /* __svr4__ */
 
 
-static int getfsquota(vol, uid, dq)
-struct vol             *vol;
-const int              uid;
-struct dqblk           *dq;
+static int getfsquota(struct vol *vol, const int uid, struct dqblk *dq)
 
 {
        struct dqblk dqg;
@@ -552,10 +541,7 @@ struct dqblk               *dq;
 }
 
 
-static int getquota( vol, dq, bsize)
-struct vol             *vol;
-struct dqblk           *dq;
-const u_int32_t                bsize;
+static int getquota( struct vol *vol, struct dqblk *dq, const u_int32_t bsize)
 {
     char *p;
 
@@ -638,8 +624,7 @@ const u_int32_t             bsize;
 #endif /* TRU64 */
 }
 
-static int overquota( dqblk )
-struct dqblk     *dqblk;
+static int overquota( struct dqblk *dqblk)
 {
     struct timeval     tv;
 
@@ -657,7 +642,7 @@ struct dqblk          *dqblk;
         return( 0 );
     }
 #else /* ultrix */
-    if ( gettimeofday( &tv, 0 ) < 0 ) {
+    if ( gettimeofday( &tv, NULL ) < 0 ) {
         LOG(log_error, logtype_afpd, "overquota: gettimeofday: %s", strerror(errno) );
         return( AFPERR_PARAM );
     }
@@ -694,10 +679,7 @@ struct dqblk         *dqblk;
 #define tobytes(a, b)  dbtob((VolSpace) (a))
 #endif
 
-int uquota_getvolspace( vol, bfree, btotal, bsize)
-struct vol     *vol;
-VolSpace       *bfree, *btotal;
-const u_int32_t bsize;
+int uquota_getvolspace( struct vol *vol, VolSpace *bfree, VolSpace *btotal, const u_int32_t bsize)
 {
        u_int64_t this_bsize;
        struct dqblk dqblk;
@@ -712,7 +694,7 @@ const u_int32_t bsize;
        this_bsize = dqblk.bsize;
 #endif
 
-#if DEBUG_QUOTA
+#ifdef DEBUG_QUOTA
         LOG(log_info, logtype_afpd, "after calling getquota in uquota_getvolspace!" );
         LOG(log_info, logtype_afpd, "dqb_ihardlimit: %u", dqblk.dqb_ihardlimit );
         LOG(log_info, logtype_afpd, "dqb_isoftlimit: %u", dqblk.dqb_isoftlimit );
@@ -747,7 +729,7 @@ const u_int32_t bsize;
                          tobytes( dqblk.dqb_curblocks, this_bsize );
        }
 
-#if DEBUG_QUOTA
+#ifdef DEBUG_QUOTA
         LOG(log_info, logtype_afpd, "bfree          : %u", *bfree );
         LOG(log_info, logtype_afpd, "btotal         : %u", *btotal );
         LOG(log_info, logtype_afpd, "bfree          : %uKB", *bfree/1024 );