Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some KNF, add a KASSERT() for smbfs_findnextLM1() case 

replace some 'never should happen' printfs with KASSERTs
This commit is contained in:
jdolecek 2003-02-21 20:15:01 +00:00
parent 50fa881e7b
commit dfc181b14f
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sys/fs/smbfs/smbfs_smb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: smbfs_smb.c,v 1.5 2003/02/19 13:51:24 jdolecek Exp $ */ /* $NetBSD: smbfs_smb.c,v 1.6 2003/02/21 20:15:01 jdolecek Exp $ */
/* /*
* Copyright (c) 2000-2001 Boris Popov * Copyright (c) 2000-2001 Boris Popov
@ -883,12 +883,13 @@ smbfs_findnextLM1(struct smbfs_fctx *ctx, int limit)
md_get_uint16le(mbp, &time); md_get_uint16le(mbp, &time);
md_get_uint16le(mbp, &date); md_get_uint16le(mbp, &date);
md_get_uint32le(mbp, &size); md_get_uint32le(mbp, &size);
KASSERT(ctx->f_name == ctx->f_fname);
cp = ctx->f_name; cp = ctx->f_name;
md_get_mem(mbp, cp, sizeof(ctx->f_fname), MB_MSYSTEM); md_get_mem(mbp, cp, sizeof(ctx->f_fname), MB_MSYSTEM);
cp[sizeof(ctx->f_fname) - 1] = 0; cp[sizeof(ctx->f_fname) - 1] = '\0';
cp += strlen(cp) - 1; cp += strlen(cp) - 1;
while (*cp == ' ' && cp >= ctx->f_name) while(*cp == ' ' && cp > ctx->f_name)
*cp-- = 0; *cp-- = '\0';
ctx->f_attr.fa_attr = battr; ctx->f_attr.fa_attr = battr;
smb_dos2unixtime(date, time, 0, rqp->sr_vc->vc_sopt.sv_tz, smb_dos2unixtime(date, time, 0, rqp->sr_vc->vc_sopt.sv_tz,
&ctx->f_attr.fa_mtime); &ctx->f_attr.fa_mtime);
@ -1004,14 +1005,10 @@ smbfs_smb_trans2find2(struct smbfs_fctx *ctx)
return ENOENT; return ENOENT;
ctx->f_rnameofs = tw; ctx->f_rnameofs = tw;
mdp = &t2p->t2_rdata; mdp = &t2p->t2_rdata;
if (mdp->md_top == NULL) {
printf("bug: ecnt = %d, but data is NULL (please report)\n", ctx->f_ecnt); KASSERT(mdp->md_top != NULL);
return ENOENT; KASSERT(mdp->md_top->m_len != 0);
}
if (mdp->md_top->m_len == 0) {
printf("bug: ecnt = %d, but m_len = 0 and m_next = %p (please report)\n", ctx->f_ecnt,mbp->mb_top->m_next);
return ENOENT;
}
ctx->f_eofs = 0; ctx->f_eofs = 0;
return 0; return 0;
} }
@ -1181,10 +1178,7 @@ smbfs_findopen(struct smbnode *dnp, const char *wildcard, int wclen, int attr,
struct smbfs_fctx *ctx; struct smbfs_fctx *ctx;
int error; int error;
ctx = malloc(sizeof(*ctx), M_SMBFSDATA, M_WAITOK); ctx = malloc(sizeof(*ctx), M_SMBFSDATA, M_WAITOK|M_ZERO);
if (ctx == NULL)
return ENOMEM;
bzero(ctx, sizeof(*ctx));
ctx->f_ssp = dnp->n_mount->sm_share; ctx->f_ssp = dnp->n_mount->sm_share;
ctx->f_dnp = dnp; ctx->f_dnp = dnp;
ctx->f_flags = SMBFS_RDD_FINDFIRST; ctx->f_flags = SMBFS_RDD_FINDFIRST;
@ -1219,6 +1213,8 @@ smbfs_findnext(struct smbfs_fctx *ctx, int limit, struct smb_cred *scred)
error = smbfs_findnextLM2(ctx, limit); error = smbfs_findnextLM2(ctx, limit);
if (error) if (error)
return error; return error;
/* Skip '.' and '..' */
if ((ctx->f_nmlen == 1 && ctx->f_name[0] == '.') || if ((ctx->f_nmlen == 1 && ctx->f_name[0] == '.') ||
(ctx->f_nmlen == 2 && ctx->f_name[0] == '.' && (ctx->f_nmlen == 2 && ctx->f_name[0] == '.' &&
ctx->f_name[1] == '.')) ctx->f_name[1] == '.'))