From 26d1332b7c82f07e56b2e9a8b80af88388eb7548 Mon Sep 17 00:00:00 2001 From: jdolecek Date: Mon, 24 Feb 2003 18:45:35 +0000 Subject: [PATCH] since smbfs_fctx.f_fname is always used as 'char', may as well define it that way rather than u_char --- sys/fs/smbfs/smbfs_smb.c | 6 +++--- sys/fs/smbfs/smbfs_subr.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/fs/smbfs/smbfs_smb.c b/sys/fs/smbfs/smbfs_smb.c index 1ddce0eb518d..afbc8292c1e5 100644 --- a/sys/fs/smbfs/smbfs_smb.c +++ b/sys/fs/smbfs/smbfs_smb.c @@ -1,4 +1,4 @@ -/* $NetBSD: smbfs_smb.c,v 1.9 2003/02/24 09:30:43 jdolecek Exp $ */ +/* $NetBSD: smbfs_smb.c,v 1.10 2003/02/24 18:45:35 jdolecek Exp $ */ /* * Copyright (c) 2000-2001 Boris Popov @@ -852,7 +852,7 @@ smbfs_findopenLM1(struct smbfs_fctx *ctx, struct smbnode *dnp, ctx->f_wildcard = NULL; ctx->f_wclen = 0; } - ctx->f_name = (char *)ctx->f_fname; + ctx->f_name = ctx->f_fname; return 0; } @@ -882,7 +882,7 @@ smbfs_findnextLM1(struct smbfs_fctx *ctx, int limit) md_get_uint16le(mbp, &time); md_get_uint16le(mbp, &date); md_get_uint32le(mbp, &size); - KASSERT(ctx->f_name == (char *)ctx->f_fname); + KASSERT(ctx->f_name == ctx->f_fname); cp = ctx->f_name; md_get_mem(mbp, cp, sizeof(ctx->f_fname), MB_MSYSTEM); cp[sizeof(ctx->f_fname) - 1] = '\0'; diff --git a/sys/fs/smbfs/smbfs_subr.h b/sys/fs/smbfs/smbfs_subr.h index 36c3d00c6a94..c4620f69c528 100644 --- a/sys/fs/smbfs/smbfs_subr.h +++ b/sys/fs/smbfs/smbfs_subr.h @@ -1,4 +1,4 @@ -/* $NetBSD: smbfs_subr.h,v 1.5 2003/02/23 18:47:10 jdolecek Exp $ */ +/* $NetBSD: smbfs_subr.h,v 1.6 2003/02/24 18:45:35 jdolecek Exp $ */ /* * Copyright (c) 2000-2001, Boris Popov @@ -117,7 +117,7 @@ struct smbfs_fctx { int f_ecnt; /* entries left in the current reponse */ int f_eofs; /* entry offset in the parameter block */ u_char f_skey[SMB_SKEYLEN]; /* server side search context */ - u_char f_fname[8 + 1 + 3 + 1]; /* common case for 8.3 filenames */ + char f_fname[8 + 1 + 3 + 1]; /* common case for 8.3 filenames */ u_int16_t f_Sid; u_int16_t f_infolevel; int f_rnamelen;