sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

r1268: varient -> variant

Browse Source
This commit is contained in:
Tim Potter 2004-06-27 11:06:10 +00:00 committed by Gerald (Jerry) Carter
parent 6b24ee3864
commit de5984c956
8 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/build/tests/shared_mmap.c
View File

@ -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 <unistd.h>

2
source/lib/ldb/ldb_tdb/ldb_search.c
View File

@ -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,

2
source/libcli/raw/clisession.c
View File

@ -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)

2
source/libcli/util/smbdes.c
View File

@ -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)

2
source/ntvfs/ntvfs_generic.c
View File

@ -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.
*/

4
source/rpc_server/samr/samdb.c
View File

@ -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,

12
source/smb_server/reply.c
View File

@ -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);
}

2
source/smb_server/sesssetup.c
View File

@ -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)