Author: vlendec Date: 2006-07-31 20:51:55 +0000 (Mon, 31 Jul 2006) New Revision: 17345
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17345 Log: Some C++ warnings Modified: branches/SAMBA_3_0/source/intl/lang_tdb.c branches/SAMBA_3_0/source/libads/kerberos.c branches/SAMBA_3_0/source/nsswitch/wb_client.c branches/SAMBA_3_0/source/nsswitch/wb_common.c Changeset: Modified: branches/SAMBA_3_0/source/intl/lang_tdb.c =================================================================== --- branches/SAMBA_3_0/source/intl/lang_tdb.c 2006-07-31 15:52:26 UTC (rev 17344) +++ branches/SAMBA_3_0/source/intl/lang_tdb.c 2006-07-31 20:51:55 UTC (rev 17345) @@ -197,7 +197,7 @@ 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 Modified: branches/SAMBA_3_0/source/libads/kerberos.c =================================================================== --- branches/SAMBA_3_0/source/libads/kerberos.c 2006-07-31 15:52:26 UTC (rev 17344) +++ branches/SAMBA_3_0/source/libads/kerberos.c 2006-07-31 20:51:55 UTC (rev 17345) @@ -45,7 +45,8 @@ 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; Modified: branches/SAMBA_3_0/source/nsswitch/wb_client.c =================================================================== --- branches/SAMBA_3_0/source/nsswitch/wb_client.c 2006-07-31 15:52:26 UTC (rev 17344) +++ branches/SAMBA_3_0/source/nsswitch/wb_client.c 2006-07-31 20:51:55 UTC (rev 17345) @@ -172,7 +172,7 @@ goto fail; } - p = response.extra_data.data; + p = (char *)response.extra_data.data; for (i=0; i<num_rids; i++) { char *q; Modified: branches/SAMBA_3_0/source/nsswitch/wb_common.c =================================================================== --- branches/SAMBA_3_0/source/nsswitch/wb_common.c 2006-07-31 15:52:26 UTC (rev 17344) +++ branches/SAMBA_3_0/source/nsswitch/wb_common.c 2006-07-31 20:51:55 UTC (rev 17345) @@ -324,7 +324,7 @@ 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; }