Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys rename SMBFS_MAXFNAMELEN to SMBFS_MAXNAMLEN for consistency



details:   https://anonhg.NetBSD.org/src/rev/b147e907e2a1
branches:  trunk
changeset: 769946:b147e907e2a1
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Sep 27 02:05:10 2011 +0000

description:
rename SMBFS_MAXFNAMELEN to SMBFS_MAXNAMLEN for consistency

diffstat:

 sys/fs/smbfs/smbfs_smb.c |  8 ++++----
 sys/netsmb/smb.h         |  3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs (53 lines):

diff -r d49de7f70517 -r b147e907e2a1 sys/fs/smbfs/smbfs_smb.c
--- a/sys/fs/smbfs/smbfs_smb.c  Tue Sep 27 01:51:42 2011 +0000
+++ b/sys/fs/smbfs/smbfs_smb.c  Tue Sep 27 02:05:10 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: smbfs_smb.c,v 1.41 2009/10/20 20:55:01 tron Exp $      */
+/*     $NetBSD: smbfs_smb.c,v 1.42 2011/09/27 02:05:10 christos Exp $  */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smbfs_smb.c,v 1.41 2009/10/20 20:55:01 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smbfs_smb.c,v 1.42 2011/09/27 02:05:10 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1122,7 +1122,7 @@
 smbfs_findopenLM2(struct smbfs_fctx *ctx, struct smbnode *dnp,
     const char *wildcard, int wclen, int attr, struct smb_cred *scred)
 {
-       ctx->f_name = malloc(SMB_MAXFNAMELEN, M_SMBFSDATA, M_WAITOK);
+       ctx->f_name = malloc(SMB_MAXNAMLEN, M_SMBFSDATA, M_WAITOK);
        if (ctx->f_name == NULL)
                return ENOMEM;
        ctx->f_infolevel = SMB_DIALECT(SSTOVC(ctx->f_ssp)) < SMB_DIALECT_NTLM0_12 ?
@@ -1205,7 +1205,7 @@
                return EINVAL;
 #endif
        }
-       nmlen = min(size, SMB_MAXFNAMELEN);
+       nmlen = min(size, SMB_MAXNAMLEN);
        cp = ctx->f_name;
        error = md_get_mem(mbp, cp, nmlen, MB_MSYSTEM);
        if (error)
diff -r d49de7f70517 -r b147e907e2a1 sys/netsmb/smb.h
--- a/sys/netsmb/smb.h  Tue Sep 27 01:51:42 2011 +0000
+++ b/sys/netsmb/smb.h  Tue Sep 27 02:05:10 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: smb.h,v 1.18 2011/09/27 01:16:35 christos Exp $        */
+/*     $NetBSD: smb.h,v 1.19 2011/09/27 02:05:10 christos Exp $        */
 
 /*
  * Copyright (c) 2000-2001 Boris Popov
@@ -394,6 +394,7 @@
 #define        SMB_MAXSHARENAMELEN     128
 #define        SMB_MAXPKTLEN           0x1FFFF
 #define        SMB_MAXCHALLENGELEN     8
+#define        SMB_MAXNAMLEN   255
 
 #define        SMB_MAXRCN              3       /* number of reconnect attempts */
 



Home | Main Index | Thread Index | Old Index