mirror of
https://github.com/samba-team/samba.git
synced 2025-08-03 04:22:09 +03:00
r17345: Some C++ warnings
This commit is contained in:
committed by
Gerald (Jerry) Carter
parent
c9f8fafad6
commit
21c8fa2fc8
@ -197,7 +197,7 @@ const char *lang_msg(const char *msgid)
|
||||
count++;
|
||||
}
|
||||
|
||||
if (!(msgid_quoted = SMB_MALLOC(strlen(msgid) + count + 1)))
|
||||
if (!(msgid_quoted = (char *)SMB_MALLOC(strlen(msgid) + count + 1)))
|
||||
return msgid;
|
||||
|
||||
/* string_sub() is unsuitable here as it replaces some punctuation
|
||||
|
@ -45,7 +45,8 @@ kerb_prompter(krb5_context ctx, void *data,
|
||||
memset(prompts[0].reply->data, '\0', prompts[0].reply->length);
|
||||
if (prompts[0].reply->length > 0) {
|
||||
if (data) {
|
||||
strncpy(prompts[0].reply->data, data, prompts[0].reply->length-1);
|
||||
strncpy(prompts[0].reply->data, (const char *)data,
|
||||
prompts[0].reply->length-1);
|
||||
prompts[0].reply->length = strlen(prompts[0].reply->data);
|
||||
} else {
|
||||
prompts[0].reply->length = 0;
|
||||
|
@ -172,7 +172,7 @@ BOOL winbind_lookup_rids(TALLOC_CTX *mem_ctx,
|
||||
goto fail;
|
||||
}
|
||||
|
||||
p = response.extra_data.data;
|
||||
p = (char *)response.extra_data.data;
|
||||
|
||||
for (i=0; i<num_rids; i++) {
|
||||
char *q;
|
||||
|
@ -324,7 +324,7 @@ static int winbind_open_pipe_sock(int recursing)
|
||||
request.flags = WBFLAG_RECURSE;
|
||||
if (winbindd_request_response(WINBINDD_PRIV_PIPE_DIR, &request, &response) == NSS_STATUS_SUCCESS) {
|
||||
int fd;
|
||||
if ((fd = winbind_named_pipe_sock(response.extra_data.data)) != -1) {
|
||||
if ((fd = winbind_named_pipe_sock((char *)response.extra_data.data)) != -1) {
|
||||
close(winbindd_fd);
|
||||
winbindd_fd = fd;
|
||||
}
|
||||
|
Reference in New Issue
Block a user