From 37fcf2236433bc5e74f19d2afac3d1d0055dcd01 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Sun, 27 Jun 2004 11:06:10 +0000 Subject: r1268: varient -> variant (This used to be commit de5984c95602ca67e8ac3139c3aa4330b74266e0) --- source4/build/tests/shared_mmap.c | 2 +- source4/lib/ldb/ldb_tdb/ldb_search.c | 2 +- source4/libcli/raw/clisession.c | 2 +- source4/libcli/util/smbdes.c | 2 +- source4/ntvfs/ntvfs_generic.c | 2 +- source4/rpc_server/samr/samdb.c | 4 ++-- source4/smb_server/reply.c | 12 ++++++------ source4/smb_server/sesssetup.c | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) (limited to 'source4') diff --git a/source4/build/tests/shared_mmap.c b/source4/build/tests/shared_mmap.c index fcef75d0d6..50dad8d696 100644 --- a/source4/build/tests/shared_mmap.c +++ b/source4/build/tests/shared_mmap.c @@ -1,5 +1,5 @@ /* this tests whether we can use a shared writeable mmap on a file - - as needed for the mmap varient of FAST_SHARE_MODES */ + as needed for the mmap variant of FAST_SHARE_MODES */ #if defined(HAVE_UNISTD_H) #include diff --git a/source4/lib/ldb/ldb_tdb/ldb_search.c b/source4/lib/ldb/ldb_tdb/ldb_search.c index d97444a6e8..7e8cd8b289 100644 --- a/source4/lib/ldb/ldb_tdb/ldb_search.c +++ b/source4/lib/ldb/ldb_tdb/ldb_search.c @@ -484,7 +484,7 @@ int ltdb_search_free(struct ldb_context *ldb, struct ldb_message **msgs) /* search the database with a LDAP-like expression. - this is the "full search" non-indexed varient + this is the "full search" non-indexed variant */ static int ltdb_search_full(struct ldb_context *ldb, const char *base, diff --git a/source4/libcli/raw/clisession.c b/source4/libcli/raw/clisession.c index 641eff053e..780ff5837b 100644 --- a/source4/libcli/raw/clisession.c +++ b/source4/libcli/raw/clisession.c @@ -403,7 +403,7 @@ static NTSTATUS smb_raw_session_setup_generic(struct cli_session *session, /**************************************************************************** Perform a session setup (sync interface) this interface allows for RAW_SESSSETUP_GENERIC to auto-select session -setup varient based on negotiated protocol options +setup variant based on negotiated protocol options ****************************************************************************/ NTSTATUS smb_raw_session_setup(struct cli_session *session, TALLOC_CTX *mem_ctx, union smb_sesssetup *parms) diff --git a/source4/libcli/util/smbdes.c b/source4/libcli/util/smbdes.c index 2492f9a1ba..99c2c00977 100644 --- a/source4/libcli/util/smbdes.c +++ b/source4/libcli/util/smbdes.c @@ -405,7 +405,7 @@ void arcfour_crypt_blob(uint8_t *data, int len, const DATA_BLOB *key) } /* - a varient that assumes a 16 byte key. This should be removed + a variant that assumes a 16 byte key. This should be removed when the last user is gone */ void arcfour_crypt(uint8_t *data, const uint8_t keystr[16], int len) diff --git a/source4/ntvfs/ntvfs_generic.c b/source4/ntvfs/ntvfs_generic.c index 0781558e8e..d7d6f67a94 100644 --- a/source4/ntvfs/ntvfs_generic.c +++ b/source4/ntvfs/ntvfs_generic.c @@ -27,7 +27,7 @@ these functions must supply the generic call, but can if it wants to also implement other levels if the need arises - this allows backend writers to only implement one varient of each + this allows backend writers to only implement one variant of each call unless they need fine grained control of the calls. */ diff --git a/source4/rpc_server/samr/samdb.c b/source4/rpc_server/samr/samdb.c index c188e917a7..3997285fd2 100644 --- a/source4/rpc_server/samr/samdb.c +++ b/source4/rpc_server/samr/samdb.c @@ -89,7 +89,7 @@ void samdb_close(void *ctx) } /* - search the sam for the specified attributes - va_list varient + search the sam for the specified attributes - va_list variant */ int samdb_search_v(void *ctx, TALLOC_CTX *mem_ctx, @@ -121,7 +121,7 @@ int samdb_search_v(void *ctx, /* - search the sam for the specified attributes - varargs varient + search the sam for the specified attributes - varargs variant */ int samdb_search(void *ctx, TALLOC_CTX *mem_ctx, diff --git a/source4/smb_server/reply.c b/source4/smb_server/reply.c index 341dddf26b..984d1be705 100644 --- a/source4/smb_server/reply.c +++ b/source4/smb_server/reply.c @@ -159,7 +159,7 @@ void reply_tcon_and_X(struct request_context *req) return; } - /* construct reply - two varients */ + /* construct reply - two variants */ if (req->smb->negotiate.protocol < PROTOCOL_NT1) { req_setup_reply(req, 2, 0); @@ -658,7 +658,7 @@ void reply_readbraw(struct request_context *req) io.readbraw.level = RAW_READ_READBRAW; - /* there are two varients, one with 10 and one with 8 command words */ + /* there are two variants, one with 10 and one with 8 command words */ if (req->in.wct != 10) { REQ_CHECK_WCT(req, 8); } @@ -669,7 +669,7 @@ void reply_readbraw(struct request_context *req) io.readbraw.in.maxcnt = SVAL(req->in.vwv, VWV(4)); io.readbraw.in.timeout = IVAL(req->in.vwv, VWV(5)); - /* the 64 bit varient */ + /* the 64 bit variant */ if (req->in.wct == 10) { uint32_t offset_high = IVAL(req->in.vwv, VWV(8)); io.readbraw.in.offset |= (((SMB_OFF_T)offset_high) << 32); @@ -875,7 +875,7 @@ void reply_read_and_X(struct request_context *req) io->readx.in.mincnt = SVAL(req->in.vwv, VWV(6)); io->readx.in.remaining = SVAL(req->in.vwv, VWV(9)); - /* the 64 bit varient */ + /* the 64 bit variant */ if (req->in.wct == 12) { uint32_t offset_high = IVAL(req->in.vwv, VWV(10)); io->readx.in.offset |= (((uint64_t)offset_high) << 32); @@ -1732,7 +1732,7 @@ void reply_lockingX(struct request_context *req) total_locks = lck->lockx.in.ulock_cnt + lck->lockx.in.lock_cnt; - /* there are two varients, one with 64 bit offsets and counts */ + /* there are two variants, one with 64 bit offsets and counts */ if (lck->lockx.in.mode & LOCKING_ANDX_LARGE_FILES) { lck_size = 20; } else { @@ -2091,7 +2091,7 @@ void reply_sesssetup(struct request_context *req) return; } - /* unsupported varient */ + /* unsupported variant */ req_reply_error(req, NT_STATUS_FOOBAR); } diff --git a/source4/smb_server/sesssetup.c b/source4/smb_server/sesssetup.c index 12b17c366a..dcaf25bb84 100644 --- a/source4/smb_server/sesssetup.c +++ b/source4/smb_server/sesssetup.c @@ -143,7 +143,7 @@ static NTSTATUS sesssetup_spnego(struct request_context *req, union smb_sesssetu } /* - backend for sessionsetup call - this takes all 3 varients of the call + backend for sessionsetup call - this takes all 3 variants of the call */ NTSTATUS sesssetup_backend(struct request_context *req, union smb_sesssetup *sess) -- cgit