svn commit: samba r16296 - in trunk/source/smbd: .

jra at samba.org jra at samba.org
Fri Jun 16 18:42:43 GMT 2006


Author: jra
Date: 2006-06-16 18:42:42 +0000 (Fri, 16 Jun 2006)
New Revision: 16296

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16296

Log:
Fix gcc4 "warning: dereferencing type-punned pointer will break
strict-aliasing rules" warning.
Jeremy.

Modified:
   trunk/source/smbd/nttrans.c


Changeset:
Modified: trunk/source/smbd/nttrans.c
===================================================================
--- trunk/source/smbd/nttrans.c	2006-06-16 18:42:39 UTC (rev 16295)
+++ trunk/source/smbd/nttrans.c	2006-06-16 18:42:42 UTC (rev 16296)
@@ -919,7 +919,7 @@
 ****************************************************************************/
 
 static int do_nt_transact_create_pipe( connection_struct *conn, char *inbuf, char *outbuf, int length, int bufsize,
-                                  char **ppsetup, uint32 setup_count,
+                                  uint16 **ppsetup, uint32 setup_count,
 				  char **ppparams, uint32 parameter_count,
 				  char **ppdata, uint32 data_count)
 {
@@ -1083,7 +1083,7 @@
 ****************************************************************************/
 
 static int call_nt_transact_create(connection_struct *conn, char *inbuf, char *outbuf, int length, int bufsize,
-                                  char **ppsetup, uint32 setup_count,
+                                  uint16 **ppsetup, uint32 setup_count,
 				  char **ppparams, uint32 parameter_count,
 				  char **ppdata, uint32 data_count, uint32 max_data_count)
 {
@@ -1814,11 +1814,11 @@
 ****************************************************************************/
 
 static int call_nt_transact_notify_change(connection_struct *conn, char *inbuf, char *outbuf, int length, int bufsize, 
-                                  char **ppsetup, uint32 setup_count,
+                                  uint16 **ppsetup, uint32 setup_count,
 				  char **ppparams, uint32 parameter_count,
 				  char **ppdata, uint32 data_count, uint32 max_data_count)
 {
-	char *setup = *ppsetup;
+	uint16 *setup = *ppsetup;
 	files_struct *fsp;
 	uint32 flags;
 
@@ -1826,7 +1826,7 @@
 		return ERROR_DOS(ERRDOS,ERRbadfunc);
 	}
 
-	fsp = file_fsp(setup,4);
+	fsp = file_fsp((char *)setup,4);
 	flags = IVAL(setup, 0);
 
 	DEBUG(3,("call_nt_transact_notify_change\n"));
@@ -1854,7 +1854,7 @@
 ****************************************************************************/
 
 static int call_nt_transact_rename(connection_struct *conn, char *inbuf, char *outbuf, int length, int bufsize,
-                                  char **ppsetup, uint32 setup_count,
+                                  uint16 **ppsetup, uint32 setup_count,
 				  char **ppparams, uint32 parameter_count,
 				  char **ppdata, uint32 data_count, uint32 max_data_count)
 {
@@ -1922,7 +1922,7 @@
 ****************************************************************************/
 
 static int call_nt_transact_query_security_desc(connection_struct *conn, char *inbuf, char *outbuf, int length, int bufsize, 
-                                  char **ppsetup, uint32 setup_count,
+                                  uint16 **ppsetup, uint32 setup_count,
 				  char **ppparams, uint32 parameter_count,
 				  char **ppdata, uint32 data_count, uint32 max_data_count)
 {
@@ -2038,7 +2038,7 @@
 ****************************************************************************/
 
 static int call_nt_transact_set_security_desc(connection_struct *conn, char *inbuf, char *outbuf, int length, int bufsize,
-                                  char **ppsetup, uint32 setup_count,
+                                  uint16 **ppsetup, uint32 setup_count,
 				  char **ppparams, uint32 parameter_count,
 				  char **ppdata, uint32 data_count, uint32 max_data_count)
 {
@@ -2084,7 +2084,7 @@
 ****************************************************************************/
 
 static int call_nt_transact_ioctl(connection_struct *conn, char *inbuf, char *outbuf, int length, int bufsize, 
-                                  char **ppsetup, uint32 setup_count,
+                                  uint16 **ppsetup, uint32 setup_count,
 				  char **ppparams, uint32 parameter_count,
 				  char **ppdata, uint32 data_count, uint32 max_data_count)
 {
@@ -2109,7 +2109,7 @@
 	DEBUG(10,("call_nt_transact_ioctl: function[0x%08X] FID[0x%04X] isFSctl[0x%02X] compfilter[0x%02X]\n", 
 		 function, fidnum, isFSctl, compfilter));
 
-	fsp=file_fsp(*ppsetup, 4);
+	fsp=file_fsp((char *)*ppsetup, 4);
 	/* this check is done in each implemented function case for now
 	   because I don't want to break anything... --metze
 	FSP_BELONGS_CONN(fsp,conn);*/
@@ -2334,7 +2334,7 @@
 ****************************************************************************/
 
 static int call_nt_transact_get_user_quota(connection_struct *conn, char *inbuf, char *outbuf, int length, int bufsize, 
-                                  char **ppsetup, uint32 setup_count,
+                                  uint16 **ppsetup, uint32 setup_count,
 				  char **ppparams, uint32 parameter_count,
 				  char **ppdata, uint32 data_count, uint32 max_data_count)
 {
@@ -2590,7 +2590,7 @@
 ****************************************************************************/
 
 static int call_nt_transact_set_user_quota(connection_struct *conn, char *inbuf, char *outbuf, int length, int bufsize, 
-                                  char **ppsetup, uint32 setup_count,
+                                  uint16 **ppsetup, uint32 setup_count,
 				  char **ppparams, uint32 parameter_count,
 				  char **ppdata, uint32 data_count, uint32 max_data_count)
 {
@@ -2720,7 +2720,7 @@
 			START_PROFILE_NESTED(NT_transact_create);
 			outsize = call_nt_transact_create(conn, inbuf, outbuf,
 							  size, bufsize, 
-							(char **)&state->setup, state->setup_count,
+							&state->setup, state->setup_count,
 							&state->param, state->total_param, 
 							&state->data, state->total_data,
 							  state->max_data_return);
@@ -2733,7 +2733,7 @@
 			START_PROFILE_NESTED(NT_transact_ioctl);
 			outsize = call_nt_transact_ioctl(conn, inbuf, outbuf,
 							 size, bufsize, 
-							 (char **)&state->setup, state->setup_count,
+							 &state->setup, state->setup_count,
 							 &state->param, state->total_param, 
 							 &state->data, state->total_data, state->max_data_return);
 			END_PROFILE_NESTED(NT_transact_ioctl);
@@ -2745,7 +2745,7 @@
 			START_PROFILE_NESTED(NT_transact_set_security_desc);
 			outsize = call_nt_transact_set_security_desc(conn, inbuf, outbuf, 
 							 size, bufsize, 
-							 (char **)&state->setup, state->setup_count,
+							 &state->setup, state->setup_count,
 							 &state->param, state->total_param, 
 							 &state->data, state->total_data, state->max_data_return);
 			END_PROFILE_NESTED(NT_transact_set_security_desc);
@@ -2757,7 +2757,7 @@
 			START_PROFILE_NESTED(NT_transact_notify_change);
 			outsize = call_nt_transact_notify_change(conn, inbuf, outbuf, 
 							 size, bufsize, 
-							 (char **)&state->setup, state->setup_count,
+							 &state->setup, state->setup_count,
 							 &state->param, state->total_param, 
 							 &state->data, state->total_data, state->max_data_return);
 			END_PROFILE_NESTED(NT_transact_notify_change);
@@ -2769,7 +2769,7 @@
 			START_PROFILE_NESTED(NT_transact_rename);
 			outsize = call_nt_transact_rename(conn, inbuf, outbuf,
 							 size, bufsize, 
-							 (char **)&state->setup, state->setup_count,
+							 &state->setup, state->setup_count,
 							 &state->param, state->total_param, 
 							 &state->data, state->total_data, state->max_data_return);
 			END_PROFILE_NESTED(NT_transact_rename);
@@ -2781,7 +2781,7 @@
 			START_PROFILE_NESTED(NT_transact_query_security_desc);
 			outsize = call_nt_transact_query_security_desc(conn, inbuf, outbuf, 
 							 size, bufsize, 
-							 (char **)&state->setup, state->setup_count,
+							 &state->setup, state->setup_count,
 							 &state->param, state->total_param, 
 							 &state->data, state->total_data, state->max_data_return);
 			END_PROFILE_NESTED(NT_transact_query_security_desc);
@@ -2794,7 +2794,7 @@
 			START_PROFILE_NESTED(NT_transact_get_user_quota);
 			outsize = call_nt_transact_get_user_quota(conn, inbuf, outbuf, 
 							 size, bufsize, 
-							 (char **)&state->setup, state->setup_count,
+							 &state->setup, state->setup_count,
 							 &state->param, state->total_param, 
 							 &state->data, state->total_data, state->max_data_return);
 			END_PROFILE_NESTED(NT_transact_get_user_quota);
@@ -2806,7 +2806,7 @@
 			START_PROFILE_NESTED(NT_transact_set_user_quota);
 			outsize = call_nt_transact_set_user_quota(conn, inbuf, outbuf, 
 							 size, bufsize, 
-							 (char **)&state->setup, state->setup_count,
+							 &state->setup, state->setup_count,
 							 &state->param, state->total_param, 
 							 &state->data, state->total_data, state->max_data_return);
 			END_PROFILE_NESTED(NT_transact_set_user_quota);



More information about the samba-cvs mailing list