diff options
| author | Samba Release Account <samba-bugs@samba.org> | 1997-03-07 17:24:22 +0000 |
|---|---|---|
| committer | Samba Release Account <samba-bugs@samba.org> | 1997-03-07 17:24:22 +0000 |
| commit | 3e2f9c3dee3895b44a367ec1b1b2d9b1b3b00e7c (patch) | |
| tree | f674950c681f1d200be46b507ef605dfd30250bd | |
| parent | 89f6150ffec4b4215ecddd764269bda325c7147b (diff) | |
| download | samba-3e2f9c3dee3895b44a367ec1b1b2d9b1b3b00e7c.tar.gz samba-3e2f9c3dee3895b44a367ec1b1b2d9b1b3b00e7c.tar.bz2 samba-3e2f9c3dee3895b44a367ec1b1b2d9b1b3b00e7c.zip | |
quotas.c: Fixed typo in #ifdef'ed compile.
ufc.c: Added pre-declaration of _ufc_doit().
jra@cygnus.com
(This used to be commit 7c690e020ffae9a56c678ae46ae87283a1aa92fe)
| -rw-r--r-- | source3/lib/ufc.c | 6 | ||||
| -rw-r--r-- | source3/smbd/quotas.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/source3/lib/ufc.c b/source3/lib/ufc.c index fc35fce80a..67b0c6920a 100644 --- a/source3/lib/ufc.c +++ b/source3/lib/ufc.c @@ -659,6 +659,8 @@ static char *output_conversion(v1, v2, salt) /* * UNIX crypt function */ + +ufc_long *_ufc_doit(ufc_long , ufc_long, ufc_long, ufc_long, ufc_long); char *ufc_crypt(char *key,char *salt) { ufc_long *s; @@ -700,7 +702,7 @@ extern long32 _ufc_sb0[], _ufc_sb1[], _ufc_sb2[], _ufc_sb3[]; #define SBA(sb, v) (*(long32*)((char*)(sb)+(v))) -ufc_long *_ufc_doit(l1, l2, r1, r2, itr) +static ufc_long *_ufc_doit(l1, l2, r1, r2, itr) ufc_long l1, l2, r1, r2, itr; { int i; long32 s, *k; @@ -740,7 +742,7 @@ extern long64 _ufc_sb0[], _ufc_sb1[], _ufc_sb2[], _ufc_sb3[]; #define SBA(sb, v) (*(long64*)((char*)(sb)+(v))) -ufc_long *_ufc_doit(l1, l2, r1, r2, itr) +static ufc_long *_ufc_doit(l1, l2, r1, r2, itr) ufc_long l1, l2, r1, r2, itr; { int i; long64 l, r, s, *k; diff --git a/source3/smbd/quotas.c b/source3/smbd/quotas.c index aec349dfd1..05b40ada0f 100644 --- a/source3/smbd/quotas.c +++ b/source3/smbd/quotas.c @@ -433,7 +433,7 @@ BOOL disk_quotas(char *path, int *bsize, int *dfree, int *dsize) /* Use softlimit to determine disk space, except when it has been exceeded */ if ((D.dqb_curblocks>D.dqb_bsoftlimit) #if !defined(__FreeBSD__) -||(D.dqb_curfiles>D.dqb_fsoftlimit)) +||(D.dqb_curfiles>D.dqb_fsoftlimit) #endif ) { *dfree = 0; |