svn commit: samba r24546 - in branches/SAMBA_3_2_0/source: lib
libsmb passdb rpc_parse smbd
vlendec at samba.org
vlendec at samba.org
Sun Aug 19 19:39:15 GMT 2007
Author: vlendec
Date: 2007-08-19 19:39:14 +0000 (Sun, 19 Aug 2007)
New Revision: 24546
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24546
Log:
Fix some C++ and type-punned warnings
Modified:
branches/SAMBA_3_2_0/source/lib/dbwrap_tdb.c
branches/SAMBA_3_2_0/source/libsmb/clikrb5.c
branches/SAMBA_3_2_0/source/passdb/secrets.c
branches/SAMBA_3_2_0/source/rpc_parse/parse_reg.c
branches/SAMBA_3_2_0/source/rpc_parse/parse_srv.c
branches/SAMBA_3_2_0/source/smbd/sesssetup.c
Changeset:
Modified: branches/SAMBA_3_2_0/source/lib/dbwrap_tdb.c
===================================================================
--- branches/SAMBA_3_2_0/source/lib/dbwrap_tdb.c 2007-08-18 18:09:25 UTC (rev 24545)
+++ branches/SAMBA_3_2_0/source/lib/dbwrap_tdb.c 2007-08-19 19:39:14 UTC (rev 24546)
@@ -57,7 +57,8 @@
}
result->key.dsize = key.dsize;
- result->key.dptr = talloc_memdup(result, key.dptr, key.dsize);
+ result->key.dptr = (unsigned char *)talloc_memdup(result, key.dptr,
+ key.dsize);
if (result->key.dptr == NULL) {
DEBUG(0, ("talloc failed\n"));
TALLOC_FREE(result);
@@ -91,7 +92,8 @@
}
result->value.dsize = value.dsize;
- result->value.dptr = talloc_memdup(result, value.dptr, value.dsize);
+ result->value.dptr = (unsigned char *)talloc_memdup(result, value.dptr,
+ value.dsize);
if (result->value.dptr == NULL) {
DEBUG(3, ("talloc failed\n"));
TALLOC_FREE(result);
Modified: branches/SAMBA_3_2_0/source/libsmb/clikrb5.c
===================================================================
--- branches/SAMBA_3_2_0/source/libsmb/clikrb5.c 2007-08-18 18:09:25 UTC (rev 24545)
+++ branches/SAMBA_3_2_0/source/libsmb/clikrb5.c 2007-08-19 19:39:14 UTC (rev 24546)
@@ -1440,7 +1440,7 @@
*opt = NULL;
- if ((my_opt = SMB_MALLOC(sizeof(krb5_get_init_creds_opt))) == NULL) {
+ if ((my_opt = SMB_MALLOC_P(krb5_get_init_creds_opt)) == NULL) {
return ENOMEM;
}
Modified: branches/SAMBA_3_2_0/source/passdb/secrets.c
===================================================================
--- branches/SAMBA_3_2_0/source/passdb/secrets.c 2007-08-18 18:09:25 UTC (rev 24545)
+++ branches/SAMBA_3_2_0/source/passdb/secrets.c 2007-08-19 19:39:14 UTC (rev 24546)
@@ -104,7 +104,7 @@
if (!tdb)
return False;
return tdb_trans_store(tdb, string_tdb_data(key),
- make_tdb_data(data, size),
+ make_tdb_data((const uint8 *)data, size),
TDB_REPLACE) == 0;
}
Modified: branches/SAMBA_3_2_0/source/rpc_parse/parse_reg.c
===================================================================
--- branches/SAMBA_3_2_0/source/rpc_parse/parse_reg.c 2007-08-18 18:09:25 UTC (rev 24545)
+++ branches/SAMBA_3_2_0/source/rpc_parse/parse_reg.c 2007-08-19 19:39:14 UTC (rev 24546)
@@ -75,7 +75,8 @@
if(!prs_align(ps))
return False;
- if(!prs_pointer("server", ps, depth, (void**)&q_u->server, sizeof(uint16), (PRS_POINTER_CAST)prs_uint16))
+ if(!prs_pointer("server", ps, depth, (void*)&q_u->server,
+ sizeof(uint16), (PRS_POINTER_CAST)prs_uint16))
return False;
if(!prs_align(ps))
@@ -275,7 +276,8 @@
if(!prs_uint32("access", ps, depth, &q_u->access))
return False;
- if(!prs_pointer("sec_info", ps, depth, (void**)&q_u->sec_info, sizeof(uint32), (PRS_POINTER_CAST)prs_uint32))
+ if(!prs_pointer("sec_info", ps, depth, (void*)&q_u->sec_info,
+ sizeof(uint32), (PRS_POINTER_CAST)prs_uint32))
return False;
if ( q_u->sec_info ) {
@@ -285,7 +287,8 @@
return False;
}
- if(!prs_pointer("disposition", ps, depth, (void**)&q_u->disposition, sizeof(uint32), (PRS_POINTER_CAST)prs_uint32))
+ if(!prs_pointer("disposition", ps, depth, (void*)&q_u->disposition,
+ sizeof(uint32), (PRS_POINTER_CAST)prs_uint32))
return False;
return True;
@@ -999,17 +1002,21 @@
if(!prs_align(ps))
return False;
- if ( !prs_pointer("type", ps, depth, (void**)&r_u->type, sizeof(uint32), (PRS_POINTER_CAST)prs_uint32))
+ if ( !prs_pointer("type", ps, depth, (void*)&r_u->type,
+ sizeof(uint32), (PRS_POINTER_CAST)prs_uint32))
return False;
- if ( !prs_pointer("value", ps, depth, (void**)&r_u->value, sizeof(REGVAL_BUFFER), (PRS_POINTER_CAST)smb_io_regval_buffer))
+ if ( !prs_pointer("value", ps, depth, (void*)&r_u->value,
+ sizeof(REGVAL_BUFFER), (PRS_POINTER_CAST)smb_io_regval_buffer))
return False;
if(!prs_align(ps))
return False;
- if ( !prs_pointer("buf_max_len", ps, depth, (void**)&r_u->buf_max_len, sizeof(uint32), (PRS_POINTER_CAST)prs_uint32))
+ if ( !prs_pointer("buf_max_len", ps, depth, (void*)&r_u->buf_max_len,
+ sizeof(uint32), (PRS_POINTER_CAST)prs_uint32))
return False;
- if ( !prs_pointer("buf_len", ps, depth, (void**)&r_u->buf_len, sizeof(uint32), (PRS_POINTER_CAST)prs_uint32))
+ if ( !prs_pointer("buf_len", ps, depth, (void*)&r_u->buf_len,
+ sizeof(uint32), (PRS_POINTER_CAST)prs_uint32))
return False;
if(!prs_werror("status", ps, depth, &r_u->status))
@@ -1146,17 +1153,22 @@
if(!prs_align(ps))
return False;
- if(!prs_pointer("type", ps, depth, (void**)&q_u->type, sizeof(uint32), (PRS_POINTER_CAST)prs_uint32))
+ if(!prs_pointer("type", ps, depth, (void*)&q_u->type,
+ sizeof(uint32), (PRS_POINTER_CAST)prs_uint32))
return False;
- if ( !prs_pointer("value", ps, depth, (void**)&q_u->value, sizeof(REGVAL_BUFFER), (PRS_POINTER_CAST)smb_io_regval_buffer))
+ if ( !prs_pointer("value", ps, depth, (void*)&q_u->value,
+ sizeof(REGVAL_BUFFER),
+ (PRS_POINTER_CAST)smb_io_regval_buffer))
return False;
if(!prs_align(ps))
return False;
- if(!prs_pointer("buffer_len", ps, depth, (void**)&q_u->buffer_len, sizeof(uint32), (PRS_POINTER_CAST)prs_uint32))
+ if(!prs_pointer("buffer_len", ps, depth, (void*)&q_u->buffer_len,
+ sizeof(uint32), (PRS_POINTER_CAST)prs_uint32))
return False;
- if(!prs_pointer("name_len", ps, depth, (void**)&q_u->name_len, sizeof(uint32), (PRS_POINTER_CAST)prs_uint32))
+ if(!prs_pointer("name_len", ps, depth, (void*)&q_u->name_len,
+ sizeof(uint32), (PRS_POINTER_CAST)prs_uint32))
return False;
return True;
@@ -1182,17 +1194,22 @@
if(!prs_align(ps))
return False;
- if(!prs_pointer("type", ps, depth, (void**)&r_u->type, sizeof(uint32), (PRS_POINTER_CAST)prs_uint32))
+ if(!prs_pointer("type", ps, depth, (void*)&r_u->type,
+ sizeof(uint32), (PRS_POINTER_CAST)prs_uint32))
return False;
- if ( !prs_pointer("value", ps, depth, (void**)&r_u->value, sizeof(REGVAL_BUFFER), (PRS_POINTER_CAST)smb_io_regval_buffer))
+ if ( !prs_pointer("value", ps, depth, (void*)&r_u->value,
+ sizeof(REGVAL_BUFFER),
+ (PRS_POINTER_CAST)smb_io_regval_buffer))
return False;
if(!prs_align(ps))
return False;
- if(!prs_pointer("buffer_len1", ps, depth, (void**)&r_u->buffer_len1, sizeof(uint32), (PRS_POINTER_CAST)prs_uint32))
+ if(!prs_pointer("buffer_len1", ps, depth, (void*)&r_u->buffer_len1,
+ sizeof(uint32), (PRS_POINTER_CAST)prs_uint32))
return False;
- if(!prs_pointer("buffer_len2", ps, depth, (void**)&r_u->buffer_len2, sizeof(uint32), (PRS_POINTER_CAST)prs_uint32))
+ if(!prs_pointer("buffer_len2", ps, depth, (void*)&r_u->buffer_len2,
+ sizeof(uint32), (PRS_POINTER_CAST)prs_uint32))
return False;
if(!prs_werror("status", ps, depth, &r_u->status))
@@ -1396,12 +1413,14 @@
if(!prs_align(ps))
return False;
- if (!prs_pointer("class", ps, depth, (void**)&q_u->classname, sizeof(UNISTR4), (PRS_POINTER_CAST)prs_unistr4))
+ if (!prs_pointer("class", ps, depth, (void*)&q_u->classname,
+ sizeof(UNISTR4), (PRS_POINTER_CAST)prs_unistr4))
return False;
if(!prs_align(ps))
return False;
- if (!prs_pointer("time", ps, depth, (void**)&q_u->time, sizeof(NTTIME), (PRS_POINTER_CAST)smb_io_nttime))
+ if (!prs_pointer("time", ps, depth, (void*)&q_u->time, sizeof(NTTIME),
+ (PRS_POINTER_CAST)smb_io_nttime))
return False;
if(!prs_align(ps))
@@ -1559,12 +1578,14 @@
if (!prs_align(ps))
return False;
- if (!prs_pointer("server", ps, depth, (void**)&q_u->server, sizeof(uint16), (PRS_POINTER_CAST)prs_uint16))
+ if (!prs_pointer("server", ps, depth, (void*)&q_u->server,
+ sizeof(uint16), (PRS_POINTER_CAST)prs_uint16))
return False;
if (!prs_align(ps))
return False;
- if (!prs_pointer("message", ps, depth, (void**)&q_u->message, sizeof(UNISTR4), (PRS_POINTER_CAST)prs_unistr4))
+ if (!prs_pointer("message", ps, depth, (void*)&q_u->message,
+ sizeof(UNISTR4), (PRS_POINTER_CAST)prs_unistr4))
return False;
if (!prs_align(ps))
@@ -1619,12 +1640,14 @@
if (!prs_align(ps))
return False;
- if (!prs_pointer("server", ps, depth, (void**)&q_u->server, sizeof(uint16), (PRS_POINTER_CAST)prs_uint16))
+ if (!prs_pointer("server", ps, depth, (void*)&q_u->server,
+ sizeof(uint16), (PRS_POINTER_CAST)prs_uint16))
return False;
if (!prs_align(ps))
return False;
- if (!prs_pointer("message", ps, depth, (void**)&q_u->message, sizeof(UNISTR4), (PRS_POINTER_CAST)prs_unistr4))
+ if (!prs_pointer("message", ps, depth, (void*)&q_u->message,
+ sizeof(UNISTR4), (PRS_POINTER_CAST)prs_unistr4))
return False;
if (!prs_align(ps))
@@ -1698,7 +1721,8 @@
if (!prs_align(ps))
return False;
- if (!prs_pointer("server", ps, depth, (void**)&q_u->server, sizeof(uint16), (PRS_POINTER_CAST)prs_uint16))
+ if (!prs_pointer("server", ps, depth, (void*)&q_u->server,
+ sizeof(uint16), (PRS_POINTER_CAST)prs_uint16))
return False;
if (!prs_align(ps))
return False;
Modified: branches/SAMBA_3_2_0/source/rpc_parse/parse_srv.c
===================================================================
--- branches/SAMBA_3_2_0/source/rpc_parse/parse_srv.c 2007-08-18 18:09:25 UTC (rev 24545)
+++ branches/SAMBA_3_2_0/source/rpc_parse/parse_srv.c 2007-08-19 19:39:14 UTC (rev 24546)
@@ -1819,19 +1819,22 @@
if(!prs_align(ps))
return False;
- if(!prs_pointer("servername", ps, depth, (void**)&q_u->servername, sizeof(UNISTR2), (PRS_POINTER_CAST)prs_io_unistr2))
+ if(!prs_pointer("servername", ps, depth, (void*)&q_u->servername,
+ sizeof(UNISTR2), (PRS_POINTER_CAST)prs_io_unistr2))
return False;
if(!prs_align(ps))
return False;
- if(!prs_pointer("qualifier", ps, depth, (void**)&q_u->qualifier, sizeof(UNISTR2), (PRS_POINTER_CAST)prs_io_unistr2))
+ if(!prs_pointer("qualifier", ps, depth, (void*)&q_u->qualifier,
+ sizeof(UNISTR2), (PRS_POINTER_CAST)prs_io_unistr2))
return False;
if(!prs_align(ps))
return False;
- if(!prs_pointer("username", ps, depth, (void**)&q_u->username, sizeof(UNISTR2), (PRS_POINTER_CAST)prs_io_unistr2))
+ if(!prs_pointer("username", ps, depth, (void*)&q_u->username,
+ sizeof(UNISTR2), (PRS_POINTER_CAST)prs_io_unistr2))
return False;
if(!prs_align(ps))
@@ -2546,17 +2549,20 @@
if(!prs_align(ps))
return False;
- if(!prs_pointer("servername", ps, depth, (void**)&q_u->servername, sizeof(UNISTR2), (PRS_POINTER_CAST)prs_io_unistr2))
+ if(!prs_pointer("servername", ps, depth, (void*)&q_u->servername,
+ sizeof(UNISTR2), (PRS_POINTER_CAST)prs_io_unistr2))
return False;
if(!prs_align(ps))
return False;
- if(!prs_pointer("qualifier", ps, depth, (void**)&q_u->qualifier, sizeof(UNISTR2), (PRS_POINTER_CAST)prs_io_unistr2))
+ if(!prs_pointer("qualifier", ps, depth, (void*)&q_u->qualifier,
+ sizeof(UNISTR2), (PRS_POINTER_CAST)prs_io_unistr2))
return False;
if(!prs_align(ps))
return False;
- if(!prs_pointer("username", ps, depth, (void**)&q_u->username, sizeof(UNISTR2), (PRS_POINTER_CAST)prs_io_unistr2))
+ if(!prs_pointer("username", ps, depth, (void*)&q_u->username,
+ sizeof(UNISTR2), (PRS_POINTER_CAST)prs_io_unistr2))
return False;
if(!prs_align(ps))
return False;
@@ -3277,7 +3283,8 @@
if(!prs_align(ps))
return False;
- if(!prs_pointer("servername", ps, depth, (void**)&q_n->servername, sizeof(UNISTR2), (PRS_POINTER_CAST)prs_io_unistr2))
+ if(!prs_pointer("servername", ps, depth, (void*)&q_n->servername,
+ sizeof(UNISTR2), (PRS_POINTER_CAST)prs_io_unistr2))
return False;
if(!prs_align(ps))
Modified: branches/SAMBA_3_2_0/source/smbd/sesssetup.c
===================================================================
--- branches/SAMBA_3_2_0/source/smbd/sesssetup.c 2007-08-18 18:09:25 UTC (rev 24545)
+++ branches/SAMBA_3_2_0/source/smbd/sesssetup.c 2007-08-19 19:39:14 UTC (rev 24546)
@@ -988,7 +988,7 @@
}
/* We must store this blob until complete. */
- pad = SMB_MALLOC(sizeof(struct pending_auth_data));
+ pad = SMB_MALLOC_P(struct pending_auth_data);
if (!pad) {
return NT_STATUS_NO_MEMORY;
}
More information about the samba-cvs
mailing list