evin/ms-nfs41-client
3
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

build: pacified compiler warnings in x86/x64

Browse source 
Signed-off-by: Casey Bodley <cbodley@citi.umich.edu>
This commit is contained in:
Casey Bodley 2011-10-31 15:25:32 -04:00 • committed by unknown
parent 0694415a95
commit 06b025a89c
6 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
daemon/idmap.c
View file

@ -91,7 +91,7 @@ struct idmap_config {
char base[VAL_LEN]; char base[VAL_LEN];
/* caching configuration */ /* caching configuration */
UINT cache_ttl; INT cache_ttl;
}; };
@ -597,7 +597,7 @@ static int idmap_query_attrs(
const unsigned attributes, const unsigned attributes,
const unsigned optional, const unsigned optional,
PCHAR *values[], PCHAR *values[],
const size_t len) const int len)
{ {
char filter[FILTER_LEN]; char filter[FILTER_LEN];
struct idmap_config *config = &context->config; struct idmap_config *config = &context->config;

3
daemon/nfs41_client.c
View file

@ -184,8 +184,7 @@ static int getdomainname(char *domain)
if (status) if (status)
dprintf(1, "getnameinfo failed %d\n", WSAGetLastError()); dprintf(1, "getnameinfo failed %d\n", WSAGetLastError());
else { else {
int i = 0; size_t i, len = strlen(hostname);
size_t len = strlen(hostname);
char *p = hostname; char *p = hostname;
dprintf(1, "getdomainname: hostname %s %d\n", hostname, len); dprintf(1, "getdomainname: hostname %s %d\n", hostname, len);
for(i = 0; i < len; i++) for(i = 0; i < len; i++)

5
daemon/nfs41_ops.c
View file

@ -128,7 +128,7 @@ int nfs41_create_session(nfs41_client *clnt, nfs41_session *session, bool_t try_
req.csa_cb_secparams[0].type = 0; /* AUTH_NONE */ req.csa_cb_secparams[0].type = 0; /* AUTH_NONE */
req.csa_cb_secparams[1].type = 1; /* AUTH_SYS */ req.csa_cb_secparams[1].type = 1; /* AUTH_SYS */
req.csa_cb_secparams[1].u.auth_sys.machinename = clnt->rpc->server_name; req.csa_cb_secparams[1].u.auth_sys.machinename = clnt->rpc->server_name;
req.csa_cb_secparams[1].u.auth_sys.stamp = time(NULL); req.csa_cb_secparams[1].u.auth_sys.stamp = (uint32_t)time(NULL);
// ca_maxrequests should be gotten from the rpc layer // ca_maxrequests should be gotten from the rpc layer
set_fore_channel_attrs(clnt->rpc, set_fore_channel_attrs(clnt->rpc,
@ -419,6 +419,7 @@ int nfs41_open(
case CLAIM_FH: case CLAIM_FH:
case CLAIM_DELEG_CUR_FH: case CLAIM_DELEG_CUR_FH:
case CLAIM_DELEG_PREV_FH: case CLAIM_DELEG_PREV_FH:
default:
/* CURRENT_FH: file being opened */ /* CURRENT_FH: file being opened */
current_fh_is_dir = FALSE; current_fh_is_dir = FALSE;
/* SEQUENCE; PUTFH(file); OPEN; GETATTR(file); PUTFH(dir); GETATTR */ /* SEQUENCE; PUTFH(file); OPEN; GETATTR(file); PUTFH(dir); GETATTR */
@ -708,7 +709,7 @@ int nfs41_write(
nfs41_getattr_args getattr_args; nfs41_getattr_args getattr_args;
nfs41_getattr_res getattr_res = {0}; nfs41_getattr_res getattr_res = {0};
bitmap4 attr_request; bitmap4 attr_request;
nfs41_file_info info; nfs41_file_info info = { 0 };
init_getattr_request(&attr_request); init_getattr_request(&attr_request);

4
daemon/nfs41_xdr.c
View file

@ -2604,7 +2604,7 @@ static bool_t encode_file_attrs(
} }
if (info->attrmask.arr[1] & FATTR4_WORD1_OWNER) { if (info->attrmask.arr[1] & FATTR4_WORD1_OWNER) {
char *ptr = &info->owner[0]; char *ptr = &info->owner[0];
uint32_t owner_len = strlen(info->owner); uint32_t owner_len = (uint32_t)strlen(info->owner);
if (!xdr_bytes(&localxdr, &ptr, &owner_len, if (!xdr_bytes(&localxdr, &ptr, &owner_len,
NFS4_OPAQUE_LIMIT)) NFS4_OPAQUE_LIMIT))
return FALSE; return FALSE;
@ -2612,7 +2612,7 @@ static bool_t encode_file_attrs(
} }
if (info->attrmask.arr[1] & FATTR4_WORD1_OWNER_GROUP) { if (info->attrmask.arr[1] & FATTR4_WORD1_OWNER_GROUP) {
char *ptr = &info->owner_group[0]; char *ptr = &info->owner_group[0];
uint32_t owner_group_len = strlen(info->owner_group); uint32_t owner_group_len = (uint32_t)strlen(info->owner_group);
if (!xdr_bytes(&localxdr, &ptr, &owner_group_len, if (!xdr_bytes(&localxdr, &ptr, &owner_group_len,
NFS4_OPAQUE_LIMIT)) NFS4_OPAQUE_LIMIT))
return FALSE; return FALSE;

2
daemon/recovery.c
View file

@ -143,7 +143,7 @@ static int recover_open(
IN OUT bool_t *grace) IN OUT bool_t *grace)
{ {
open_delegation4 delegation = { 0 }; open_delegation4 delegation = { 0 };
stateid4 stateid; stateid4 stateid = { 0 };
enum open_delegation_type4 delegate_type = OPEN_DELEGATE_NONE; enum open_delegation_type4 delegate_type = OPEN_DELEGATE_NONE;
int status = NFS4ERR_BADHANDLE; int status = NFS4ERR_BADHANDLE;

6
daemon/service.c
View file

@ -264,11 +264,9 @@ BOOL ReportStatusToSCMgr(DWORD dwCurrentState,
// Report the status of the service to the service control manager. // Report the status of the service to the service control manager.
// fResult = SetServiceStatus(sshStatusHandle, &ssStatus);
if (!(fResult = SetServiceStatus( sshStatusHandle, &ssStatus))) if (!fResult)
{
AddToMessageLog(TEXT("SetServiceStatus")); AddToMessageLog(TEXT("SetServiceStatus"));
}
} }
return fResult; return fResult;
} }